Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid into...

[simgrid.git] / include / surf / simgrid_dtd.h

diff --git a/include/surf/simgrid_dtd.h b/include/surf/simgrid_dtd.h
index 3856968906de487b56350ca1ca5ca1aab5b79d01..fafa97a5160c6981858645e2610ab4963f1f44e9 100644 (file)
--- a/include/surf/simgrid_dtd.h
+++ b/include/surf/simgrid_dtd.h
@@ -70,6 +70,8 @@ XBT_PUBLIC(void ) STag_surfxml_mstorage(void);
 XBT_PUBLIC(void ) ETag_surfxml_mstorage(void);
 XBT_PUBLIC(void ) STag_surfxml_host(void);
 XBT_PUBLIC(void ) ETag_surfxml_host(void);
+XBT_PUBLIC(void ) STag_surfxml_gpu(void);
+XBT_PUBLIC(void ) ETag_surfxml_gpu(void);
 XBT_PUBLIC(void ) STag_surfxml_host_link(void);
 XBT_PUBLIC(void ) ETag_surfxml_host_link(void);
 XBT_PUBLIC(void ) STag_surfxml_cluster(void);
@@ -133,6 +135,8 @@ typedef int AT_surfxml_host_power;
 #define AU_surfxml_host_power NULL
 typedef int AT_surfxml_cabinet_suffix;
 #define AU_surfxml_cabinet_suffix NULL
+typedef int AT_surfxml_gpu_name;
+#define AU_surfxml_gpu_name NULL
 typedef int AT_surfxml_router_id;
 #define AU_surfxml_router_id NULL
 typedef int AT_surfxml_storage_type_id;
@@ -347,6 +351,13 @@ XBT_PUBLIC_DATA(AT_surfxml_host_power ) AX_surfxml_host_power;
 #define A_surfxml_host_power (surfxml_bufferstack + AX_surfxml_host_power)
 XBT_PUBLIC_DATA(AT_surfxml_cabinet_suffix ) AX_surfxml_cabinet_suffix;
 #define A_surfxml_cabinet_suffix (surfxml_bufferstack + AX_surfxml_cabinet_suffix)
+<<<<<<< HEAD
+=======
+XBT_PUBLIC_DATA(short ) int surfxml_cabinet_suffix_isset;
+XBT_PUBLIC_DATA(AT_surfxml_gpu_name ) AX_surfxml_gpu_name;
+#define A_surfxml_gpu_name (surfxml_bufferstack + AX_surfxml_gpu_name)
+XBT_PUBLIC_DATA(short ) int surfxml_gpu_name_isset;
+>>>>>>> 4ede28040ccac8fc9bab86ef8d571838020f2a14
 XBT_PUBLIC_DATA(AT_surfxml_router_id ) AX_surfxml_router_id;
 #define A_surfxml_router_id (surfxml_bufferstack + AX_surfxml_router_id)
 XBT_PUBLIC_DATA(AT_surfxml_storage_type_id ) AX_surfxml_storage_type_id;