From: Arnaud Giersch Date: Tue, 13 Mar 2018 15:15:06 +0000 (+0100) Subject: Define XBT_PUBLIC_DATA without parameter too. X-Git-Tag: v3.19~64 X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/6af348b861fc72e45173e89c5f9540cefb6ee252 Define XBT_PUBLIC_DATA without parameter too. --- diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 301509a68c..7663714f92 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -1456,7 +1456,7 @@ INCLUDE_FILE_PATTERNS = PREDEFINED = XBT_PUBLIC= \ XBT_EXPORT_NO_IMPORT(type)=type \ XBT_IMPORT_NO_EXPORT(type)=type \ - XBT_PUBLIC_DATA(type)="extern type" \ + XBT_PUBLIC_DATA=extern \ XBT_INLINE= \ XBT_PRIVATE= diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index 119905759d..387efa63f4 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -47,8 +47,7 @@ typedef s4u_NetZone* msg_netzone_t; */ typedef sg_host_t msg_host_t; - -XBT_PUBLIC_DATA(int) sg_storage_max_file_descriptors; +XBT_PUBLIC_DATA int sg_storage_max_file_descriptors; /* ******************************** Task ************************************ */ typedef struct s_simdata_task_t* simdata_task_t; diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h index 324f0923e8..ba669e79dc 100644 --- a/include/smpi/smpi.h +++ b/include/smpi/smpi.h @@ -226,63 +226,63 @@ typedef SMPI_Info* MPI_Info; #define MPI_STATUSES_IGNORE ((MPI_Status*)NULL) #define MPI_DATATYPE_NULL ((const MPI_Datatype)NULL) -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_CHAR; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_SHORT; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_INT; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_LONG; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_LONG_LONG; +XBT_PUBLIC_DATA const MPI_Datatype MPI_CHAR; +XBT_PUBLIC_DATA const MPI_Datatype MPI_SHORT; +XBT_PUBLIC_DATA const MPI_Datatype MPI_INT; +XBT_PUBLIC_DATA const MPI_Datatype MPI_LONG; +XBT_PUBLIC_DATA const MPI_Datatype MPI_LONG_LONG; #define MPI_LONG_LONG_INT MPI_LONG_LONG -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_SIGNED_CHAR; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_UNSIGNED_CHAR; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_UNSIGNED_SHORT; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_UNSIGNED; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_UNSIGNED_LONG; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_UNSIGNED_LONG_LONG; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_FLOAT; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_DOUBLE; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_LONG_DOUBLE; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_WCHAR; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_C_BOOL; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_INT8_T; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_INT16_T; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_INT32_T; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_INT64_T; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_UINT8_T; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_BYTE; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_UINT16_T; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_UINT32_T; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_UINT64_T; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_C_FLOAT_COMPLEX; +XBT_PUBLIC_DATA const MPI_Datatype MPI_SIGNED_CHAR; +XBT_PUBLIC_DATA const MPI_Datatype MPI_UNSIGNED_CHAR; +XBT_PUBLIC_DATA const MPI_Datatype MPI_UNSIGNED_SHORT; +XBT_PUBLIC_DATA const MPI_Datatype MPI_UNSIGNED; +XBT_PUBLIC_DATA const MPI_Datatype MPI_UNSIGNED_LONG; +XBT_PUBLIC_DATA const MPI_Datatype MPI_UNSIGNED_LONG_LONG; +XBT_PUBLIC_DATA const MPI_Datatype MPI_FLOAT; +XBT_PUBLIC_DATA const MPI_Datatype MPI_DOUBLE; +XBT_PUBLIC_DATA const MPI_Datatype MPI_LONG_DOUBLE; +XBT_PUBLIC_DATA const MPI_Datatype MPI_WCHAR; +XBT_PUBLIC_DATA const MPI_Datatype MPI_C_BOOL; +XBT_PUBLIC_DATA const MPI_Datatype MPI_INT8_T; +XBT_PUBLIC_DATA const MPI_Datatype MPI_INT16_T; +XBT_PUBLIC_DATA const MPI_Datatype MPI_INT32_T; +XBT_PUBLIC_DATA const MPI_Datatype MPI_INT64_T; +XBT_PUBLIC_DATA const MPI_Datatype MPI_UINT8_T; +XBT_PUBLIC_DATA const MPI_Datatype MPI_BYTE; +XBT_PUBLIC_DATA const MPI_Datatype MPI_UINT16_T; +XBT_PUBLIC_DATA const MPI_Datatype MPI_UINT32_T; +XBT_PUBLIC_DATA const MPI_Datatype MPI_UINT64_T; +XBT_PUBLIC_DATA const MPI_Datatype MPI_C_FLOAT_COMPLEX; #define MPI_C_COMPLEX MPI_C_FLOAT_COMPLEX -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_C_DOUBLE_COMPLEX; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_C_LONG_DOUBLE_COMPLEX; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_AINT; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_OFFSET; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_LB; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_UB; +XBT_PUBLIC_DATA const MPI_Datatype MPI_C_DOUBLE_COMPLEX; +XBT_PUBLIC_DATA const MPI_Datatype MPI_C_LONG_DOUBLE_COMPLEX; +XBT_PUBLIC_DATA const MPI_Datatype MPI_AINT; +XBT_PUBLIC_DATA const MPI_Datatype MPI_OFFSET; +XBT_PUBLIC_DATA const MPI_Datatype MPI_LB; +XBT_PUBLIC_DATA const MPI_Datatype MPI_UB; //The following are datatypes for the MPI functions MPI_MAXLOC and MPI_MINLOC. -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_FLOAT_INT; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_LONG_INT; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_DOUBLE_INT; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_SHORT_INT; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_2INT; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_LONG_DOUBLE_INT; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_2FLOAT; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_2DOUBLE; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_2LONG;//only for compatibility with Fortran - -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_REAL; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_REAL4; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_REAL8; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_REAL16; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_COMPLEX8; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_COMPLEX16; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_COMPLEX32; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_INTEGER1; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_INTEGER2; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_INTEGER4; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_INTEGER8; -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_INTEGER16; +XBT_PUBLIC_DATA const MPI_Datatype MPI_FLOAT_INT; +XBT_PUBLIC_DATA const MPI_Datatype MPI_LONG_INT; +XBT_PUBLIC_DATA const MPI_Datatype MPI_DOUBLE_INT; +XBT_PUBLIC_DATA const MPI_Datatype MPI_SHORT_INT; +XBT_PUBLIC_DATA const MPI_Datatype MPI_2INT; +XBT_PUBLIC_DATA const MPI_Datatype MPI_LONG_DOUBLE_INT; +XBT_PUBLIC_DATA const MPI_Datatype MPI_2FLOAT; +XBT_PUBLIC_DATA const MPI_Datatype MPI_2DOUBLE; +XBT_PUBLIC_DATA const MPI_Datatype MPI_2LONG; // only for compatibility with Fortran + +XBT_PUBLIC_DATA const MPI_Datatype MPI_REAL; +XBT_PUBLIC_DATA const MPI_Datatype MPI_REAL4; +XBT_PUBLIC_DATA const MPI_Datatype MPI_REAL8; +XBT_PUBLIC_DATA const MPI_Datatype MPI_REAL16; +XBT_PUBLIC_DATA const MPI_Datatype MPI_COMPLEX8; +XBT_PUBLIC_DATA const MPI_Datatype MPI_COMPLEX16; +XBT_PUBLIC_DATA const MPI_Datatype MPI_COMPLEX32; +XBT_PUBLIC_DATA const MPI_Datatype MPI_INTEGER1; +XBT_PUBLIC_DATA const MPI_Datatype MPI_INTEGER2; +XBT_PUBLIC_DATA const MPI_Datatype MPI_INTEGER4; +XBT_PUBLIC_DATA const MPI_Datatype MPI_INTEGER8; +XBT_PUBLIC_DATA const MPI_Datatype MPI_INTEGER16; //for now we only send int values at max #define MPI_Count int @@ -316,32 +316,32 @@ typedef void MPI_User_function(void *invec, void *inoutvec, int *len, MPI_Dataty typedef SMPI_Op *MPI_Op; #define MPI_OP_NULL ((MPI_Op)NULL) -XBT_PUBLIC_DATA( MPI_Op ) MPI_MAX; -XBT_PUBLIC_DATA( MPI_Op ) MPI_MIN; -XBT_PUBLIC_DATA( MPI_Op ) MPI_MAXLOC; -XBT_PUBLIC_DATA( MPI_Op ) MPI_MINLOC; -XBT_PUBLIC_DATA( MPI_Op ) MPI_SUM; -XBT_PUBLIC_DATA( MPI_Op ) MPI_PROD; -XBT_PUBLIC_DATA( MPI_Op ) MPI_LAND; -XBT_PUBLIC_DATA( MPI_Op ) MPI_LOR; -XBT_PUBLIC_DATA( MPI_Op ) MPI_LXOR; -XBT_PUBLIC_DATA( MPI_Op ) MPI_BAND; -XBT_PUBLIC_DATA( MPI_Op ) MPI_BOR; -XBT_PUBLIC_DATA( MPI_Op ) MPI_BXOR; +XBT_PUBLIC_DATA MPI_Op MPI_MAX; +XBT_PUBLIC_DATA MPI_Op MPI_MIN; +XBT_PUBLIC_DATA MPI_Op MPI_MAXLOC; +XBT_PUBLIC_DATA MPI_Op MPI_MINLOC; +XBT_PUBLIC_DATA MPI_Op MPI_SUM; +XBT_PUBLIC_DATA MPI_Op MPI_PROD; +XBT_PUBLIC_DATA MPI_Op MPI_LAND; +XBT_PUBLIC_DATA MPI_Op MPI_LOR; +XBT_PUBLIC_DATA MPI_Op MPI_LXOR; +XBT_PUBLIC_DATA MPI_Op MPI_BAND; +XBT_PUBLIC_DATA MPI_Op MPI_BOR; +XBT_PUBLIC_DATA MPI_Op MPI_BXOR; //For accumulate -XBT_PUBLIC_DATA( MPI_Op ) MPI_REPLACE; -XBT_PUBLIC_DATA( MPI_Op ) MPI_NO_OP; +XBT_PUBLIC_DATA MPI_Op MPI_REPLACE; +XBT_PUBLIC_DATA MPI_Op MPI_NO_OP; typedef SMPI_Group* MPI_Group; #define MPI_GROUP_NULL ((MPI_Group)NULL) -XBT_PUBLIC_DATA( MPI_Group ) MPI_GROUP_EMPTY; +XBT_PUBLIC_DATA MPI_Group MPI_GROUP_EMPTY; typedef SMPI_Comm* MPI_Comm; #define MPI_COMM_NULL ((MPI_Comm)NULL) -XBT_PUBLIC_DATA( MPI_Comm ) MPI_COMM_WORLD; +XBT_PUBLIC_DATA MPI_Comm MPI_COMM_WORLD; #define MPI_COMM_SELF smpi_process_comm_self() typedef SMPI_Request* MPI_Request; @@ -707,10 +707,10 @@ typedef MPI_Comm_errhandler_function MPI_Comm_errhandler_fn; typedef MPI_File_errhandler_function MPI_File_errhandler_fn; typedef MPI_Win_errhandler_function MPI_Win_errhandler_fn; #define MPI_INFO_ENV 1 -XBT_PUBLIC_DATA( const MPI_Datatype ) MPI_PACKED; -XBT_PUBLIC_DATA(MPI_Errhandler*) MPI_ERRORS_RETURN; -XBT_PUBLIC_DATA(MPI_Errhandler*) MPI_ERRORS_ARE_FATAL; -XBT_PUBLIC_DATA(MPI_Errhandler*) MPI_ERRHANDLER_NULL; +XBT_PUBLIC_DATA const MPI_Datatype MPI_PACKED; +XBT_PUBLIC_DATA MPI_Errhandler* MPI_ERRORS_RETURN; +XBT_PUBLIC_DATA MPI_Errhandler* MPI_ERRORS_ARE_FATAL; +XBT_PUBLIC_DATA MPI_Errhandler* MPI_ERRHANDLER_NULL; MPI_CALL(XBT_PUBLIC MPI_Errhandler, MPI_Errhandler_f2c, (MPI_Fint errhandler)); MPI_CALL(XBT_PUBLIC MPI_Fint, MPI_Errhandler_c2f, (MPI_Errhandler errhandler)); diff --git a/include/xbt/asserts.h b/include/xbt/asserts.h index b3494cf0a7..da09fbafaf 100644 --- a/include/xbt/asserts.h +++ b/include/xbt/asserts.h @@ -14,7 +14,7 @@ #include "xbt/ex.h" SG_BEGIN_DECL() -XBT_PUBLIC_DATA(int) xbt_log_no_loc; /* Do not show the backtrace on failed backtrace when doing our tests */ +XBT_PUBLIC_DATA int xbt_log_no_loc; /* Do not show the backtrace on failed backtrace when doing our tests */ /** * @addtogroup XBT_error diff --git a/include/xbt/base.h b/include/xbt/base.h index 644917ad75..3129f5db17 100644 --- a/include/xbt/base.h +++ b/include/xbt/base.h @@ -159,7 +159,7 @@ # define XBT_PUBLIC __declspec(dllexport) # define XBT_EXPORT_NO_IMPORT(type) __declspec(dllexport) type # define XBT_IMPORT_NO_EXPORT(type) type -# define XBT_PUBLIC_DATA(type) extern __declspec(dllexport) type +# define XBT_PUBLIC_DATA extern __declspec(dllexport) # define XBT_PRIVATE /* Link against the DLL */ @@ -167,21 +167,21 @@ # define XBT_PUBLIC __declspec(dllimport) # define XBT_EXPORT_NO_IMPORT(type) type # define XBT_IMPORT_NO_EXPORT(type) __declspec(dllimport) type -# define XBT_PUBLIC_DATA(type) extern __declspec(dllimport) type +# define XBT_PUBLIC_DATA extern __declspec(dllimport) # define XBT_PRIVATE #elif defined(__ELF__) # define XBT_PUBLIC __attribute__((visibility("default"))) # define XBT_EXPORT_NO_IMPORT(type) __attribute__((visibility("default"))) type # define XBT_IMPORT_NO_EXPORT(type) __attribute__((visibility("default"))) type -# define XBT_PUBLIC_DATA(type) extern __attribute__((visibility("default"))) type +# define XBT_PUBLIC_DATA extern __attribute__((visibility("default"))) # define XBT_PRIVATE __attribute__((visibility("hidden"))) #else # define XBT_PUBLIC /* public */ # define XBT_EXPORT_NO_IMPORT(type) type # define XBT_IMPORT_NO_EXPORT(type) type -# define XBT_PUBLIC_DATA(type) extern type +# define XBT_PUBLIC_DATA extern # define XBT_PRIVATE /** @private */ #endif diff --git a/include/xbt/log.h b/include/xbt/log.h index 5c4c61a7e2..0182bd538a 100644 --- a/include/xbt/log.h +++ b/include/xbt/log.h @@ -310,7 +310,7 @@ XBT_PUBLIC void _xbt_log_event_log(xbt_log_event_t ev, const char* fmt, ...) XBT XBT_PUBLIC int _xbt_log_cat_init(xbt_log_category_t category, e_xbt_log_priority_t priority); #ifdef DLL_EXPORT -XBT_PUBLIC_DATA(s_xbt_log_category_t) _XBT_LOGV(XBT_LOG_ROOT_CAT); +XBT_PUBLIC_DATA s_xbt_log_category_t _XBT_LOGV(XBT_LOG_ROOT_CAT); #else // If we `dllexport` the root log category, MinGW does not want us to take its address with the error: // > initializer element is not constant diff --git a/include/xbt/misc.h b/include/xbt/misc.h index 8c133be84c..0aea0698d0 100644 --- a/include/xbt/misc.h +++ b/include/xbt/misc.h @@ -18,16 +18,16 @@ SG_BEGIN_DECL() /** Cache the size of a memory page for the current system. */ -XBT_PUBLIC_DATA(int) xbt_pagesize; +XBT_PUBLIC_DATA int xbt_pagesize; /** Cache the number of bits of addresses inside a given page, log2(xbt_pagesize). */ -XBT_PUBLIC_DATA(int) xbt_pagebits; +XBT_PUBLIC_DATA int xbt_pagebits; /** Helps ensuring that header version (SIMGRID_VERSION_MAJOR and friends) and dynamic library version do match. */ XBT_PUBLIC void sg_version_check(int lib_version_major, int lib_version_minor, int lib_version_patch); /** Contains all the parameters we got from the command line */ -XBT_PUBLIC_DATA(xbt_dynar_t) sg_cmdline; +XBT_PUBLIC_DATA xbt_dynar_t sg_cmdline; /* snprintf related functions */ /** @addtogroup XBT_str diff --git a/include/xbt/replay.hpp b/include/xbt/replay.hpp index bad7a8573b..dcbfa212c3 100644 --- a/include/xbt/replay.hpp +++ b/include/xbt/replay.hpp @@ -21,7 +21,7 @@ namespace xbt { typedef std::vector ReplayAction; static std::unordered_map*> action_queues; -XBT_PUBLIC_DATA(std::ifstream*) action_fs; +XBT_PUBLIC_DATA std::ifstream* action_fs; XBT_PUBLIC int replay_runner(int argc, char* argv[]); } } diff --git a/include/xbt/virtu.h b/include/xbt/virtu.h index ef604516e4..1386a56d9c 100644 --- a/include/xbt/virtu.h +++ b/include/xbt/virtu.h @@ -20,10 +20,10 @@ XBT_PUBLIC const char* xbt_procname(void); XBT_PUBLIC int xbt_getpid(void); /* Get the name of the UNIX process englobing the world */ -XBT_PUBLIC_DATA(char*) xbt_binary_name; +XBT_PUBLIC_DATA char* xbt_binary_name; /** Contains all the parameters we got from the command line (including argv[0]) */ -XBT_PUBLIC_DATA(xbt_dynar_t) xbt_cmdline; +XBT_PUBLIC_DATA xbt_dynar_t xbt_cmdline; SG_END_DECL() #endif /* XBT_VIRTU_H */ diff --git a/src/include/simgrid/sg_config.h b/src/include/simgrid/sg_config.h index f185d514b1..a72e8ce6d9 100644 --- a/src/include/simgrid/sg_config.h +++ b/src/include/simgrid/sg_config.h @@ -12,9 +12,9 @@ /** Config Globals */ SG_BEGIN_DECL() -XBT_PUBLIC_DATA(xbt_cfg_t) simgrid_config; -XBT_PUBLIC_DATA(int) _sg_cfg_init_status; -XBT_PUBLIC_DATA(int) _sg_cfg_exit_asap; +XBT_PUBLIC_DATA xbt_cfg_t simgrid_config; +XBT_PUBLIC_DATA int _sg_cfg_init_status; +XBT_PUBLIC_DATA int _sg_cfg_exit_asap; XBT_PUBLIC void sg_config_init(int* argc, char** argv); XBT_PUBLIC void sg_config_finalize(); diff --git a/src/include/surf/surf.hpp b/src/include/surf/surf.hpp index a6b24d481b..d26ba8e4e8 100644 --- a/src/include/surf/surf.hpp +++ b/src/include/surf/surf.hpp @@ -111,12 +111,12 @@ XBT_PUBLIC void surf_cpu_action_set_bound(simgrid::kernel::resource::Action* act /** \ingroup SURF_models * \brief The CPU model object for the physical machine layer */ -XBT_PUBLIC_DATA(surf_cpu_model_t) surf_cpu_model_pm; +XBT_PUBLIC_DATA surf_cpu_model_t surf_cpu_model_pm; /** \ingroup SURF_models * \brief The CPU model object for the virtual machine layer */ -XBT_PUBLIC_DATA(surf_cpu_model_t) surf_cpu_model_vm; +XBT_PUBLIC_DATA surf_cpu_model_t surf_cpu_model_vm; /** \ingroup SURF_models * \brief Initializes the CPU model with the model Cas01 @@ -140,17 +140,17 @@ XBT_PUBLIC void surf_cpu_model_init_ti(); * \brief The list of all available optimization modes (both for cpu and networks). * These optimization modes can be set using --cfg=cpu/optim:... and --cfg=network/optim:... */ -XBT_PUBLIC_DATA(s_surf_model_description_t) surf_optimization_mode_description[]; +XBT_PUBLIC_DATA s_surf_model_description_t surf_optimization_mode_description[]; /** \ingroup SURF_plugins * \brief The list of all available surf plugins */ -XBT_PUBLIC_DATA(s_surf_model_description_t) surf_plugin_description[]; +XBT_PUBLIC_DATA s_surf_model_description_t surf_plugin_description[]; /** \ingroup SURF_models * \brief The list of all available cpu model models */ -XBT_PUBLIC_DATA(s_surf_model_description_t) surf_cpu_model_description[]; +XBT_PUBLIC_DATA s_surf_model_description_t surf_cpu_model_description[]; /** \ingroup SURF_models * \brief The network model @@ -158,7 +158,7 @@ XBT_PUBLIC_DATA(s_surf_model_description_t) surf_cpu_model_description[]; * When creating a new API on top on SURF, you shouldn't use the network model unless you know what you are doing. * Only the host model should be accessed because depending on the platform model, the network model can be NULL. */ -XBT_PUBLIC_DATA(surf_network_model_t) surf_network_model; +XBT_PUBLIC_DATA surf_network_model_t surf_network_model; /** \ingroup SURF_models * \brief Same as network model 'LagrangeVelho', only with different correction factors. @@ -262,7 +262,7 @@ XBT_PUBLIC void surf_network_model_init_Vegas(); /** \ingroup SURF_models * \brief The list of all available network model models */ -XBT_PUBLIC_DATA(s_surf_model_description_t) surf_network_model_description[]; +XBT_PUBLIC_DATA s_surf_model_description_t surf_network_model_description[]; /** \ingroup SURF_models * \brief The storage model @@ -273,9 +273,9 @@ XBT_PUBLIC void surf_storage_model_init_default(); * \brief The list of all available storage modes. * This storage mode can be set using --cfg=storage/model:... */ -XBT_PUBLIC_DATA(s_surf_model_description_t) surf_storage_model_description[]; +XBT_PUBLIC_DATA s_surf_model_description_t surf_storage_model_description[]; -XBT_PUBLIC_DATA(surf_storage_model_t) surf_storage_model; +XBT_PUBLIC_DATA surf_storage_model_t surf_storage_model; /** \ingroup SURF_models * \brief The host model @@ -283,7 +283,7 @@ XBT_PUBLIC_DATA(surf_storage_model_t) surf_storage_model; * Note that when you create an API on top of SURF, the host model should be the only one you use * because depending on the platform model, the network model and the CPU model may not exist. */ -XBT_PUBLIC_DATA(surf_host_model_t) surf_host_model; +XBT_PUBLIC_DATA surf_host_model_t surf_host_model; /** \ingroup SURF_models * \brief Initializes the platform with a compound host model @@ -313,7 +313,7 @@ XBT_PUBLIC void surf_host_model_init_ptask_L07(); /** \ingroup SURF_models * \brief The list of all available host model models */ -XBT_PUBLIC_DATA(s_surf_model_description_t) surf_host_model_description[]; +XBT_PUBLIC_DATA s_surf_model_description_t surf_host_model_description[]; /** \ingroup SURF_models * \brief Initializes the platform with the current best network and cpu models at hand diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp index d33af391de..373df85487 100644 --- a/src/kernel/context/Context.hpp +++ b/src/kernel/context/Context.hpp @@ -118,7 +118,7 @@ public: /* This allows Java to hijack the context factory (Java induces factories of factory :) */ typedef ContextFactory* (*ContextFactoryInitializer)(); -XBT_PUBLIC_DATA(ContextFactoryInitializer) factory_initializer; +XBT_PUBLIC_DATA ContextFactoryInitializer factory_initializer; XBT_PRIVATE ContextFactory* thread_factory(); XBT_PRIVATE ContextFactory* sysv_factory(); @@ -138,7 +138,7 @@ XBT_PUBLIC smx_context_t SIMIX_context_new(std::function code, void_pfn_ smx_actor_t simix_process); #ifndef WIN32 -XBT_PUBLIC_DATA(char sigsegv_stack[SIGSTKSZ]); +XBT_PUBLIC_DATA char sigsegv_stack[SIGSTKSZ]; #endif /* We are using the bottom of the stack to save some information, like the diff --git a/src/mc/mc_replay.hpp b/src/mc/mc_replay.hpp index c4c2dd82ae..813d138b89 100644 --- a/src/mc/mc_replay.hpp +++ b/src/mc/mc_replay.hpp @@ -13,7 +13,7 @@ * * This is using the format generated by traceToString(). */ -XBT_PUBLIC_DATA(std::string) MC_record_path; +XBT_PUBLIC_DATA std::string MC_record_path; /** Whether the replay mode is enabled */ static inline int MC_record_replay_is_active() diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp index cf12610f43..9cbcae083d 100644 --- a/src/msg/msg_private.hpp +++ b/src/msg/msg_private.hpp @@ -89,7 +89,7 @@ XBT_PRIVATE void TRACE_msg_process_destroy(std::string process_name, int process extern "C" { -XBT_PUBLIC_DATA(MSG_Global_t) msg_global; +XBT_PUBLIC_DATA MSG_Global_t msg_global; /*************************************************************/ XBT_PRIVATE void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_proc); diff --git a/src/plugins/vm/VirtualMachineImpl.hpp b/src/plugins/vm/VirtualMachineImpl.hpp index 95255c5288..0be3938269 100644 --- a/src/plugins/vm/VirtualMachineImpl.hpp +++ b/src/plugins/vm/VirtualMachineImpl.hpp @@ -106,6 +106,6 @@ public: } } -XBT_PUBLIC_DATA(simgrid::vm::VMModel*) surf_vm_model; +XBT_PUBLIC_DATA simgrid::vm::VMModel* surf_vm_model; #endif /* VM_INTERFACE_HPP_ */ diff --git a/src/simdag/dax_dtd.h b/src/simdag/dax_dtd.h index 2763df185d..1d218f10e8 100644 --- a/src/simdag/dax_dtd.h +++ b/src/simdag/dax_dtd.h @@ -108,84 +108,84 @@ typedef int AT_dax__uses_type; #define AU_dax__uses_type NULL /* FleXML-provided data. */ -XBT_PUBLIC_DATA(int) dax__pcdata_ix; -XBT_PUBLIC_DATA(char *) dax__bufferstack; +XBT_PUBLIC_DATA int dax__pcdata_ix; +XBT_PUBLIC_DATA char *dax__bufferstack; #define dax__pcdata (dax__bufferstack + dax__pcdata_ix) -XBT_PUBLIC_DATA(AT_dax__adag_childCount) AX_dax__adag_childCount; +XBT_PUBLIC_DATA AT_dax__adag_childCount AX_dax__adag_childCount; #define A_dax__adag_childCount (dax__bufferstack + AX_dax__adag_childCount) -XBT_PUBLIC_DATA(short int) dax__adag_childCount_isset; -XBT_PUBLIC_DATA(AT_dax__adag_count) AX_dax__adag_count; +XBT_PUBLIC_DATA short int dax__adag_childCount_isset; +XBT_PUBLIC_DATA AT_dax__adag_count AX_dax__adag_count; #define A_dax__adag_count (dax__bufferstack + AX_dax__adag_count) -XBT_PUBLIC_DATA(short int) dax__adag_count_isset; -XBT_PUBLIC_DATA(AT_dax__adag_fileCount) AX_dax__adag_fileCount; +XBT_PUBLIC_DATA short int dax__adag_count_isset; +XBT_PUBLIC_DATA AT_dax__adag_fileCount AX_dax__adag_fileCount; #define A_dax__adag_fileCount (dax__bufferstack + AX_dax__adag_fileCount) -XBT_PUBLIC_DATA(short int) dax__adag_fileCount_isset; -XBT_PUBLIC_DATA(AT_dax__adag_index) AX_dax__adag_index; +XBT_PUBLIC_DATA short int dax__adag_fileCount_isset; +XBT_PUBLIC_DATA AT_dax__adag_index AX_dax__adag_index; #define A_dax__adag_index (dax__bufferstack + AX_dax__adag_index) -XBT_PUBLIC_DATA(short int) dax__adag_index_isset; -XBT_PUBLIC_DATA(AT_dax__adag_jobCount) AX_dax__adag_jobCount; +XBT_PUBLIC_DATA short int dax__adag_index_isset; +XBT_PUBLIC_DATA AT_dax__adag_jobCount AX_dax__adag_jobCount; #define A_dax__adag_jobCount (dax__bufferstack + AX_dax__adag_jobCount) -XBT_PUBLIC_DATA(short int) dax__adag_jobCount_isset; -XBT_PUBLIC_DATA(AT_dax__adag_name) AX_dax__adag_name; +XBT_PUBLIC_DATA short int dax__adag_jobCount_isset; +XBT_PUBLIC_DATA AT_dax__adag_name AX_dax__adag_name; #define A_dax__adag_name (dax__bufferstack + AX_dax__adag_name) -XBT_PUBLIC_DATA(short int) dax__adag_name_isset; -XBT_PUBLIC_DATA(AT_dax__adag_version) AX_dax__adag_version; +XBT_PUBLIC_DATA short int dax__adag_name_isset; +XBT_PUBLIC_DATA AT_dax__adag_version AX_dax__adag_version; #define A_dax__adag_version (dax__bufferstack + AX_dax__adag_version) -XBT_PUBLIC_DATA(short int) dax__adag_version_isset; -XBT_PUBLIC_DATA(AT_dax__adag_xmlns) AX_dax__adag_xmlns; +XBT_PUBLIC_DATA short int dax__adag_version_isset; +XBT_PUBLIC_DATA AT_dax__adag_xmlns AX_dax__adag_xmlns; #define A_dax__adag_xmlns (dax__bufferstack + AX_dax__adag_xmlns) -XBT_PUBLIC_DATA(short int) dax__adag_xmlns_isset; -XBT_PUBLIC_DATA(AT_dax__adag_xmlns_c_xsi) AX_dax__adag_xmlns_c_xsi; +XBT_PUBLIC_DATA short int dax__adag_xmlns_isset; +XBT_PUBLIC_DATA AT_dax__adag_xmlns_c_xsi AX_dax__adag_xmlns_c_xsi; #define A_dax__adag_xmlns_c_xsi (dax__bufferstack + AX_dax__adag_xmlns_c_xsi) -XBT_PUBLIC_DATA(short int) dax__adag_xmlns_c_xsi_isset; -XBT_PUBLIC_DATA(AT_dax__adag_xsi_c_schemaLocation) AX_dax__adag_xsi_c_schemaLocation; +XBT_PUBLIC_DATA short int dax__adag_xmlns_c_xsi_isset; +XBT_PUBLIC_DATA AT_dax__adag_xsi_c_schemaLocation AX_dax__adag_xsi_c_schemaLocation; #define A_dax__adag_xsi_c_schemaLocation (dax__bufferstack + AX_dax__adag_xsi_c_schemaLocation) -XBT_PUBLIC_DATA(short int) dax__adag_xsi_c_schemaLocation_isset; -XBT_PUBLIC_DATA(AT_dax__child_ref) AX_dax__child_ref; +XBT_PUBLIC_DATA short int dax__adag_xsi_c_schemaLocation_isset; +XBT_PUBLIC_DATA AT_dax__child_ref AX_dax__child_ref; #define A_dax__child_ref (dax__bufferstack + AX_dax__child_ref) -XBT_PUBLIC_DATA(short int) dax__child_ref_isset; -XBT_PUBLIC_DATA(AT_dax__job_id) AX_dax__job_id; +XBT_PUBLIC_DATA short int dax__child_ref_isset; +XBT_PUBLIC_DATA AT_dax__job_id AX_dax__job_id; #define A_dax__job_id (dax__bufferstack + AX_dax__job_id) -XBT_PUBLIC_DATA(short int) dax__job_id_isset; -XBT_PUBLIC_DATA(AT_dax__job_level) AX_dax__job_level; +XBT_PUBLIC_DATA short int dax__job_id_isset; +XBT_PUBLIC_DATA AT_dax__job_level AX_dax__job_level; #define A_dax__job_level (dax__bufferstack + AX_dax__job_level) -XBT_PUBLIC_DATA(short int) dax__job_level_isset; -XBT_PUBLIC_DATA(AT_dax__job_name) AX_dax__job_name; +XBT_PUBLIC_DATA short int dax__job_level_isset; +XBT_PUBLIC_DATA AT_dax__job_name AX_dax__job_name; #define A_dax__job_name (dax__bufferstack + AX_dax__job_name) -XBT_PUBLIC_DATA(short int) dax__job_name_isset; -XBT_PUBLIC_DATA(AT_dax__job_namespace) AX_dax__job_namespace; +XBT_PUBLIC_DATA short int dax__job_name_isset; +XBT_PUBLIC_DATA AT_dax__job_namespace AX_dax__job_namespace; #define A_dax__job_namespace (dax__bufferstack + AX_dax__job_namespace) -XBT_PUBLIC_DATA(short int) dax__job_namespace_isset; -XBT_PUBLIC_DATA(AT_dax__job_runtime) AX_dax__job_runtime; +XBT_PUBLIC_DATA short int dax__job_namespace_isset; +XBT_PUBLIC_DATA AT_dax__job_runtime AX_dax__job_runtime; #define A_dax__job_runtime (dax__bufferstack + AX_dax__job_runtime) -XBT_PUBLIC_DATA(short int) dax__job_runtime_isset; -XBT_PUBLIC_DATA(AT_dax__job_version) AX_dax__job_version; +XBT_PUBLIC_DATA short int dax__job_runtime_isset; +XBT_PUBLIC_DATA AT_dax__job_version AX_dax__job_version; #define A_dax__job_version (dax__bufferstack + AX_dax__job_version) -XBT_PUBLIC_DATA(short int) dax__job_version_isset; -XBT_PUBLIC_DATA(AT_dax__parent_ref) AX_dax__parent_ref; +XBT_PUBLIC_DATA short int dax__job_version_isset; +XBT_PUBLIC_DATA AT_dax__parent_ref AX_dax__parent_ref; #define A_dax__parent_ref (dax__bufferstack + AX_dax__parent_ref) -XBT_PUBLIC_DATA(short int) dax__parent_ref_isset; -XBT_PUBLIC_DATA(AT_dax__uses_file) AX_dax__uses_file; +XBT_PUBLIC_DATA short int dax__parent_ref_isset; +XBT_PUBLIC_DATA AT_dax__uses_file AX_dax__uses_file; #define A_dax__uses_file (dax__bufferstack + AX_dax__uses_file) -XBT_PUBLIC_DATA(short int) dax__uses_file_isset; -XBT_PUBLIC_DATA(AT_dax__uses_link) AX_dax__uses_link; +XBT_PUBLIC_DATA short int dax__uses_file_isset; +XBT_PUBLIC_DATA AT_dax__uses_link AX_dax__uses_link; #define A_dax__uses_link AX_dax__uses_link -XBT_PUBLIC_DATA(short int) dax__uses_link_isset; -XBT_PUBLIC_DATA(AT_dax__uses_optional) AX_dax__uses_optional; +XBT_PUBLIC_DATA short int dax__uses_link_isset; +XBT_PUBLIC_DATA AT_dax__uses_optional AX_dax__uses_optional; #define A_dax__uses_optional AX_dax__uses_optional -XBT_PUBLIC_DATA(short int) dax__uses_optional_isset; -XBT_PUBLIC_DATA(AT_dax__uses_register) AX_dax__uses_register; +XBT_PUBLIC_DATA short int dax__uses_optional_isset; +XBT_PUBLIC_DATA AT_dax__uses_register AX_dax__uses_register; #define A_dax__uses_register AX_dax__uses_register -XBT_PUBLIC_DATA(short int) dax__uses_register_isset; -XBT_PUBLIC_DATA(AT_dax__uses_size) AX_dax__uses_size; +XBT_PUBLIC_DATA short int dax__uses_register_isset; +XBT_PUBLIC_DATA AT_dax__uses_size AX_dax__uses_size; #define A_dax__uses_size (dax__bufferstack + AX_dax__uses_size) -XBT_PUBLIC_DATA(short int) dax__uses_size_isset; -XBT_PUBLIC_DATA(AT_dax__uses_transfer) AX_dax__uses_transfer; +XBT_PUBLIC_DATA short int dax__uses_size_isset; +XBT_PUBLIC_DATA AT_dax__uses_transfer AX_dax__uses_transfer; #define A_dax__uses_transfer AX_dax__uses_transfer -XBT_PUBLIC_DATA(short int) dax__uses_transfer_isset; -XBT_PUBLIC_DATA(AT_dax__uses_type) AX_dax__uses_type; +XBT_PUBLIC_DATA short int dax__uses_transfer_isset; +XBT_PUBLIC_DATA AT_dax__uses_type AX_dax__uses_type; #define A_dax__uses_type (dax__bufferstack + AX_dax__uses_type) -XBT_PUBLIC_DATA(short int) dax__uses_type_isset; +XBT_PUBLIC_DATA short int dax__uses_type_isset; /* XML application utilities. */ XBT_PUBLIC int dax__element_context(int); diff --git a/src/simix/popping_private.hpp b/src/simix/popping_private.hpp index b7d4b5fa9e..52ca2e7274 100644 --- a/src/simix/popping_private.hpp +++ b/src/simix/popping_private.hpp @@ -18,7 +18,7 @@ extern "C" { /********************************* Simcalls *********************************/ -XBT_PUBLIC_DATA(const char*) simcall_names[]; /* Name of each simcall */ +XBT_PUBLIC_DATA const char* simcall_names[]; /* Name of each simcall */ #include "popping_enum.h" /* Definition of e_smx_simcall_t, with one value per simcall */ diff --git a/src/simix/smx_private.hpp b/src/simix/smx_private.hpp index 7764500538..1dc37d7bd1 100644 --- a/src/simix/smx_private.hpp +++ b/src/simix/smx_private.hpp @@ -66,7 +66,7 @@ public: extern "C" { -XBT_PUBLIC_DATA(std::unique_ptr) simix_global; +XBT_PUBLIC_DATA std::unique_ptr simix_global; XBT_PUBLIC void SIMIX_clean(); diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp index 632ec37349..3325fd34ce 100644 --- a/src/surf/HostImpl.hpp +++ b/src/surf/HostImpl.hpp @@ -18,7 +18,7 @@ * Tools * *********/ -XBT_PUBLIC_DATA(simgrid::surf::HostModel*) surf_host_model; +XBT_PUBLIC_DATA simgrid::surf::HostModel* surf_host_model; /********* * Model * diff --git a/src/surf/StorageImpl.hpp b/src/surf/StorageImpl.hpp index 55e8db6766..6575a189d8 100644 --- a/src/surf/StorageImpl.hpp +++ b/src/surf/StorageImpl.hpp @@ -35,29 +35,29 @@ class StorageAction; * @brief Callbacks handler which emit the callbacks after Storage creation * * @details Callback functions have the following signature: `void(Storage*)` */ -XBT_PUBLIC_DATA(simgrid::xbt::signal) storageCreatedCallbacks; +XBT_PUBLIC_DATA simgrid::xbt::signal storageCreatedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks handler which emit the callbacks after Storage destruction * * @details Callback functions have the following signature: `void(StoragePtr)` */ -XBT_PUBLIC_DATA(simgrid::xbt::signal) storageDestructedCallbacks; +XBT_PUBLIC_DATA simgrid::xbt::signal storageDestructedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks handler which emit the callbacks after Storage State changed * * @details Callback functions have the following signature: `void(StorageAction *action, int previouslyOn, int * currentlyOn)` */ -XBT_PUBLIC_DATA(simgrid::xbt::signal) storageStateChangedCallbacks; +XBT_PUBLIC_DATA simgrid::xbt::signal storageStateChangedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks handler which emit the callbacks after StorageAction State changed * * @details Callback functions have the following signature: `void(StorageAction *action, * simgrid::kernel::resource::Action::State old, simgrid::kernel::resource::Action::State current)` */ -XBT_PUBLIC_DATA( - simgrid::xbt::signal) -storageActionStateChangedCallbacks; +XBT_PUBLIC_DATA +simgrid::xbt::signal + storageActionStateChangedCallbacks; /********* * Model * diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index 07c50578e5..24aa95f43f 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -28,9 +28,9 @@ *********/ /* user-visible parameters */ -XBT_PUBLIC_DATA(double) sg_maxmin_precision; -XBT_PUBLIC_DATA(double) sg_surf_precision; -XBT_PUBLIC_DATA(int) sg_concurrency_limit; +XBT_PUBLIC_DATA double sg_maxmin_precision; +XBT_PUBLIC_DATA double sg_surf_precision; +XBT_PUBLIC_DATA int sg_concurrency_limit; extern XBT_PRIVATE double sg_tcp_gamma; extern XBT_PRIVATE double sg_latency_factor; @@ -69,7 +69,7 @@ XBT_PUBLIC double surf_get_clock(); /** \ingroup SURF_simulation * \brief List of hosts that have just restarted and whose autorestart process should be restarted. */ -XBT_PUBLIC_DATA(std::vector) host_that_restart; +XBT_PUBLIC_DATA std::vector host_that_restart; int XBT_PRIVATE __surf_is_absolute_file_path(const char *file_path); @@ -80,6 +80,6 @@ int XBT_PRIVATE __surf_is_absolute_file_path(const char *file_path); /** \ingroup SURF_models * \brief List of initialized models */ -XBT_PUBLIC_DATA(std::vector*) all_existing_models; +XBT_PUBLIC_DATA std::vector* all_existing_models; #endif /* SURF_MODEL_H_ */ diff --git a/src/surf/xml/simgrid_dtd.h b/src/surf/xml/simgrid_dtd.h index 801cab37c0..5db30d4138 100644 --- a/src/surf/xml/simgrid_dtd.h +++ b/src/surf/xml/simgrid_dtd.h @@ -352,387 +352,387 @@ typedef int AT_surfxml_zoneRoute_src; typedef enum { AU_surfxml_zoneRoute_symmetrical, A_surfxml_zoneRoute_symmetrical_YES,A_surfxml_zoneRoute_symmetrical_NO } AT_surfxml_zoneRoute_symmetrical; /* FleXML-provided data. */ -XBT_PUBLIC_DATA(int) surfxml_pcdata_ix; -XBT_PUBLIC_DATA(char *) surfxml_bufferstack; +XBT_PUBLIC_DATA int surfxml_pcdata_ix; +XBT_PUBLIC_DATA char *surfxml_bufferstack; #define surfxml_pcdata (surfxml_bufferstack + surfxml_pcdata_ix) -XBT_PUBLIC_DATA(AT_surfxml_AS_id) AX_surfxml_AS_id; +XBT_PUBLIC_DATA AT_surfxml_AS_id AX_surfxml_AS_id; #define A_surfxml_AS_id (surfxml_bufferstack + AX_surfxml_AS_id) -XBT_PUBLIC_DATA(short int) surfxml_AS_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_AS_routing) AX_surfxml_AS_routing; +XBT_PUBLIC_DATA short int surfxml_AS_id_isset; +XBT_PUBLIC_DATA AT_surfxml_AS_routing AX_surfxml_AS_routing; #define A_surfxml_AS_routing AX_surfxml_AS_routing -XBT_PUBLIC_DATA(short int) surfxml_AS_routing_isset; -XBT_PUBLIC_DATA(AT_surfxml_ASroute_dst) AX_surfxml_ASroute_dst; +XBT_PUBLIC_DATA short int surfxml_AS_routing_isset; +XBT_PUBLIC_DATA AT_surfxml_ASroute_dst AX_surfxml_ASroute_dst; #define A_surfxml_ASroute_dst (surfxml_bufferstack + AX_surfxml_ASroute_dst) -XBT_PUBLIC_DATA(short int) surfxml_ASroute_dst_isset; -XBT_PUBLIC_DATA(AT_surfxml_ASroute_gw___dst) AX_surfxml_ASroute_gw___dst; +XBT_PUBLIC_DATA short int surfxml_ASroute_dst_isset; +XBT_PUBLIC_DATA AT_surfxml_ASroute_gw___dst AX_surfxml_ASroute_gw___dst; #define A_surfxml_ASroute_gw___dst (surfxml_bufferstack + AX_surfxml_ASroute_gw___dst) -XBT_PUBLIC_DATA(short int) surfxml_ASroute_gw___dst_isset; -XBT_PUBLIC_DATA(AT_surfxml_ASroute_gw___src) AX_surfxml_ASroute_gw___src; +XBT_PUBLIC_DATA short int surfxml_ASroute_gw___dst_isset; +XBT_PUBLIC_DATA AT_surfxml_ASroute_gw___src AX_surfxml_ASroute_gw___src; #define A_surfxml_ASroute_gw___src (surfxml_bufferstack + AX_surfxml_ASroute_gw___src) -XBT_PUBLIC_DATA(short int) surfxml_ASroute_gw___src_isset; -XBT_PUBLIC_DATA(AT_surfxml_ASroute_src) AX_surfxml_ASroute_src; +XBT_PUBLIC_DATA short int surfxml_ASroute_gw___src_isset; +XBT_PUBLIC_DATA AT_surfxml_ASroute_src AX_surfxml_ASroute_src; #define A_surfxml_ASroute_src (surfxml_bufferstack + AX_surfxml_ASroute_src) -XBT_PUBLIC_DATA(short int) surfxml_ASroute_src_isset; -XBT_PUBLIC_DATA(AT_surfxml_ASroute_symmetrical) AX_surfxml_ASroute_symmetrical; +XBT_PUBLIC_DATA short int surfxml_ASroute_src_isset; +XBT_PUBLIC_DATA AT_surfxml_ASroute_symmetrical AX_surfxml_ASroute_symmetrical; #define A_surfxml_ASroute_symmetrical AX_surfxml_ASroute_symmetrical -XBT_PUBLIC_DATA(short int) surfxml_ASroute_symmetrical_isset; -XBT_PUBLIC_DATA(AT_surfxml_actor_function) AX_surfxml_actor_function; +XBT_PUBLIC_DATA short int surfxml_ASroute_symmetrical_isset; +XBT_PUBLIC_DATA AT_surfxml_actor_function AX_surfxml_actor_function; #define A_surfxml_actor_function (surfxml_bufferstack + AX_surfxml_actor_function) -XBT_PUBLIC_DATA(short int) surfxml_actor_function_isset; -XBT_PUBLIC_DATA(AT_surfxml_actor_host) AX_surfxml_actor_host; +XBT_PUBLIC_DATA short int surfxml_actor_function_isset; +XBT_PUBLIC_DATA AT_surfxml_actor_host AX_surfxml_actor_host; #define A_surfxml_actor_host (surfxml_bufferstack + AX_surfxml_actor_host) -XBT_PUBLIC_DATA(short int) surfxml_actor_host_isset; -XBT_PUBLIC_DATA(AT_surfxml_actor_kill___time) AX_surfxml_actor_kill___time; +XBT_PUBLIC_DATA short int surfxml_actor_host_isset; +XBT_PUBLIC_DATA AT_surfxml_actor_kill___time AX_surfxml_actor_kill___time; #define A_surfxml_actor_kill___time (surfxml_bufferstack + AX_surfxml_actor_kill___time) -XBT_PUBLIC_DATA(short int) surfxml_actor_kill___time_isset; -XBT_PUBLIC_DATA(AT_surfxml_actor_on___failure) AX_surfxml_actor_on___failure; +XBT_PUBLIC_DATA short int surfxml_actor_kill___time_isset; +XBT_PUBLIC_DATA AT_surfxml_actor_on___failure AX_surfxml_actor_on___failure; #define A_surfxml_actor_on___failure AX_surfxml_actor_on___failure -XBT_PUBLIC_DATA(short int) surfxml_actor_on___failure_isset; -XBT_PUBLIC_DATA(AT_surfxml_actor_start___time) AX_surfxml_actor_start___time; +XBT_PUBLIC_DATA short int surfxml_actor_on___failure_isset; +XBT_PUBLIC_DATA AT_surfxml_actor_start___time AX_surfxml_actor_start___time; #define A_surfxml_actor_start___time (surfxml_bufferstack + AX_surfxml_actor_start___time) -XBT_PUBLIC_DATA(short int) surfxml_actor_start___time_isset; -XBT_PUBLIC_DATA(AT_surfxml_argument_value) AX_surfxml_argument_value; +XBT_PUBLIC_DATA short int surfxml_actor_start___time_isset; +XBT_PUBLIC_DATA AT_surfxml_argument_value AX_surfxml_argument_value; #define A_surfxml_argument_value (surfxml_bufferstack + AX_surfxml_argument_value) -XBT_PUBLIC_DATA(short int) surfxml_argument_value_isset; -XBT_PUBLIC_DATA(AT_surfxml_backbone_bandwidth) AX_surfxml_backbone_bandwidth; +XBT_PUBLIC_DATA short int surfxml_argument_value_isset; +XBT_PUBLIC_DATA AT_surfxml_backbone_bandwidth AX_surfxml_backbone_bandwidth; #define A_surfxml_backbone_bandwidth (surfxml_bufferstack + AX_surfxml_backbone_bandwidth) -XBT_PUBLIC_DATA(short int) surfxml_backbone_bandwidth_isset; -XBT_PUBLIC_DATA(AT_surfxml_backbone_id) AX_surfxml_backbone_id; +XBT_PUBLIC_DATA short int surfxml_backbone_bandwidth_isset; +XBT_PUBLIC_DATA AT_surfxml_backbone_id AX_surfxml_backbone_id; #define A_surfxml_backbone_id (surfxml_bufferstack + AX_surfxml_backbone_id) -XBT_PUBLIC_DATA(short int) surfxml_backbone_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_backbone_latency) AX_surfxml_backbone_latency; +XBT_PUBLIC_DATA short int surfxml_backbone_id_isset; +XBT_PUBLIC_DATA AT_surfxml_backbone_latency AX_surfxml_backbone_latency; #define A_surfxml_backbone_latency (surfxml_bufferstack + AX_surfxml_backbone_latency) -XBT_PUBLIC_DATA(short int) surfxml_backbone_latency_isset; -XBT_PUBLIC_DATA(AT_surfxml_bypassASroute_dst) AX_surfxml_bypassASroute_dst; +XBT_PUBLIC_DATA short int surfxml_backbone_latency_isset; +XBT_PUBLIC_DATA AT_surfxml_bypassASroute_dst AX_surfxml_bypassASroute_dst; #define A_surfxml_bypassASroute_dst (surfxml_bufferstack + AX_surfxml_bypassASroute_dst) -XBT_PUBLIC_DATA(short int) surfxml_bypassASroute_dst_isset; -XBT_PUBLIC_DATA(AT_surfxml_bypassASroute_gw___dst) AX_surfxml_bypassASroute_gw___dst; +XBT_PUBLIC_DATA short int surfxml_bypassASroute_dst_isset; +XBT_PUBLIC_DATA AT_surfxml_bypassASroute_gw___dst AX_surfxml_bypassASroute_gw___dst; #define A_surfxml_bypassASroute_gw___dst (surfxml_bufferstack + AX_surfxml_bypassASroute_gw___dst) -XBT_PUBLIC_DATA(short int) surfxml_bypassASroute_gw___dst_isset; -XBT_PUBLIC_DATA(AT_surfxml_bypassASroute_gw___src) AX_surfxml_bypassASroute_gw___src; +XBT_PUBLIC_DATA short int surfxml_bypassASroute_gw___dst_isset; +XBT_PUBLIC_DATA AT_surfxml_bypassASroute_gw___src AX_surfxml_bypassASroute_gw___src; #define A_surfxml_bypassASroute_gw___src (surfxml_bufferstack + AX_surfxml_bypassASroute_gw___src) -XBT_PUBLIC_DATA(short int) surfxml_bypassASroute_gw___src_isset; -XBT_PUBLIC_DATA(AT_surfxml_bypassASroute_src) AX_surfxml_bypassASroute_src; +XBT_PUBLIC_DATA short int surfxml_bypassASroute_gw___src_isset; +XBT_PUBLIC_DATA AT_surfxml_bypassASroute_src AX_surfxml_bypassASroute_src; #define A_surfxml_bypassASroute_src (surfxml_bufferstack + AX_surfxml_bypassASroute_src) -XBT_PUBLIC_DATA(short int) surfxml_bypassASroute_src_isset; -XBT_PUBLIC_DATA(AT_surfxml_bypassRoute_dst) AX_surfxml_bypassRoute_dst; +XBT_PUBLIC_DATA short int surfxml_bypassASroute_src_isset; +XBT_PUBLIC_DATA AT_surfxml_bypassRoute_dst AX_surfxml_bypassRoute_dst; #define A_surfxml_bypassRoute_dst (surfxml_bufferstack + AX_surfxml_bypassRoute_dst) -XBT_PUBLIC_DATA(short int) surfxml_bypassRoute_dst_isset; -XBT_PUBLIC_DATA(AT_surfxml_bypassRoute_src) AX_surfxml_bypassRoute_src; +XBT_PUBLIC_DATA short int surfxml_bypassRoute_dst_isset; +XBT_PUBLIC_DATA AT_surfxml_bypassRoute_src AX_surfxml_bypassRoute_src; #define A_surfxml_bypassRoute_src (surfxml_bufferstack + AX_surfxml_bypassRoute_src) -XBT_PUBLIC_DATA(short int) surfxml_bypassRoute_src_isset; -XBT_PUBLIC_DATA(AT_surfxml_bypassZoneRoute_dst) AX_surfxml_bypassZoneRoute_dst; +XBT_PUBLIC_DATA short int surfxml_bypassRoute_src_isset; +XBT_PUBLIC_DATA AT_surfxml_bypassZoneRoute_dst AX_surfxml_bypassZoneRoute_dst; #define A_surfxml_bypassZoneRoute_dst (surfxml_bufferstack + AX_surfxml_bypassZoneRoute_dst) -XBT_PUBLIC_DATA(short int) surfxml_bypassZoneRoute_dst_isset; -XBT_PUBLIC_DATA(AT_surfxml_bypassZoneRoute_gw___dst) AX_surfxml_bypassZoneRoute_gw___dst; +XBT_PUBLIC_DATA short int surfxml_bypassZoneRoute_dst_isset; +XBT_PUBLIC_DATA AT_surfxml_bypassZoneRoute_gw___dst AX_surfxml_bypassZoneRoute_gw___dst; #define A_surfxml_bypassZoneRoute_gw___dst (surfxml_bufferstack + AX_surfxml_bypassZoneRoute_gw___dst) -XBT_PUBLIC_DATA(short int) surfxml_bypassZoneRoute_gw___dst_isset; -XBT_PUBLIC_DATA(AT_surfxml_bypassZoneRoute_gw___src) AX_surfxml_bypassZoneRoute_gw___src; +XBT_PUBLIC_DATA short int surfxml_bypassZoneRoute_gw___dst_isset; +XBT_PUBLIC_DATA AT_surfxml_bypassZoneRoute_gw___src AX_surfxml_bypassZoneRoute_gw___src; #define A_surfxml_bypassZoneRoute_gw___src (surfxml_bufferstack + AX_surfxml_bypassZoneRoute_gw___src) -XBT_PUBLIC_DATA(short int) surfxml_bypassZoneRoute_gw___src_isset; -XBT_PUBLIC_DATA(AT_surfxml_bypassZoneRoute_src) AX_surfxml_bypassZoneRoute_src; +XBT_PUBLIC_DATA short int surfxml_bypassZoneRoute_gw___src_isset; +XBT_PUBLIC_DATA AT_surfxml_bypassZoneRoute_src AX_surfxml_bypassZoneRoute_src; #define A_surfxml_bypassZoneRoute_src (surfxml_bufferstack + AX_surfxml_bypassZoneRoute_src) -XBT_PUBLIC_DATA(short int) surfxml_bypassZoneRoute_src_isset; -XBT_PUBLIC_DATA(AT_surfxml_cabinet_bw) AX_surfxml_cabinet_bw; +XBT_PUBLIC_DATA short int surfxml_bypassZoneRoute_src_isset; +XBT_PUBLIC_DATA AT_surfxml_cabinet_bw AX_surfxml_cabinet_bw; #define A_surfxml_cabinet_bw (surfxml_bufferstack + AX_surfxml_cabinet_bw) -XBT_PUBLIC_DATA(short int) surfxml_cabinet_bw_isset; -XBT_PUBLIC_DATA(AT_surfxml_cabinet_id) AX_surfxml_cabinet_id; +XBT_PUBLIC_DATA short int surfxml_cabinet_bw_isset; +XBT_PUBLIC_DATA AT_surfxml_cabinet_id AX_surfxml_cabinet_id; #define A_surfxml_cabinet_id (surfxml_bufferstack + AX_surfxml_cabinet_id) -XBT_PUBLIC_DATA(short int) surfxml_cabinet_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_cabinet_lat) AX_surfxml_cabinet_lat; +XBT_PUBLIC_DATA short int surfxml_cabinet_id_isset; +XBT_PUBLIC_DATA AT_surfxml_cabinet_lat AX_surfxml_cabinet_lat; #define A_surfxml_cabinet_lat (surfxml_bufferstack + AX_surfxml_cabinet_lat) -XBT_PUBLIC_DATA(short int) surfxml_cabinet_lat_isset; -XBT_PUBLIC_DATA(AT_surfxml_cabinet_prefix) AX_surfxml_cabinet_prefix; +XBT_PUBLIC_DATA short int surfxml_cabinet_lat_isset; +XBT_PUBLIC_DATA AT_surfxml_cabinet_prefix AX_surfxml_cabinet_prefix; #define A_surfxml_cabinet_prefix (surfxml_bufferstack + AX_surfxml_cabinet_prefix) -XBT_PUBLIC_DATA(short int) surfxml_cabinet_prefix_isset; -XBT_PUBLIC_DATA(AT_surfxml_cabinet_radical) AX_surfxml_cabinet_radical; +XBT_PUBLIC_DATA short int surfxml_cabinet_prefix_isset; +XBT_PUBLIC_DATA AT_surfxml_cabinet_radical AX_surfxml_cabinet_radical; #define A_surfxml_cabinet_radical (surfxml_bufferstack + AX_surfxml_cabinet_radical) -XBT_PUBLIC_DATA(short int) surfxml_cabinet_radical_isset; -XBT_PUBLIC_DATA(AT_surfxml_cabinet_speed) AX_surfxml_cabinet_speed; +XBT_PUBLIC_DATA short int surfxml_cabinet_radical_isset; +XBT_PUBLIC_DATA AT_surfxml_cabinet_speed AX_surfxml_cabinet_speed; #define A_surfxml_cabinet_speed (surfxml_bufferstack + AX_surfxml_cabinet_speed) -XBT_PUBLIC_DATA(short int) surfxml_cabinet_speed_isset; -XBT_PUBLIC_DATA(AT_surfxml_cabinet_suffix) AX_surfxml_cabinet_suffix; +XBT_PUBLIC_DATA short int surfxml_cabinet_speed_isset; +XBT_PUBLIC_DATA AT_surfxml_cabinet_suffix AX_surfxml_cabinet_suffix; #define A_surfxml_cabinet_suffix (surfxml_bufferstack + AX_surfxml_cabinet_suffix) -XBT_PUBLIC_DATA(short int) surfxml_cabinet_suffix_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_bb___bw) AX_surfxml_cluster_bb___bw; +XBT_PUBLIC_DATA short int surfxml_cabinet_suffix_isset; +XBT_PUBLIC_DATA AT_surfxml_cluster_bb___bw AX_surfxml_cluster_bb___bw; #define A_surfxml_cluster_bb___bw (surfxml_bufferstack + AX_surfxml_cluster_bb___bw) -XBT_PUBLIC_DATA(short int) surfxml_cluster_bb___bw_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_bb___lat) AX_surfxml_cluster_bb___lat; +XBT_PUBLIC_DATA short int surfxml_cluster_bb___bw_isset; +XBT_PUBLIC_DATA AT_surfxml_cluster_bb___lat AX_surfxml_cluster_bb___lat; #define A_surfxml_cluster_bb___lat (surfxml_bufferstack + AX_surfxml_cluster_bb___lat) -XBT_PUBLIC_DATA(short int) surfxml_cluster_bb___lat_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_bb___sharing___policy) AX_surfxml_cluster_bb___sharing___policy; +XBT_PUBLIC_DATA short int surfxml_cluster_bb___lat_isset; +XBT_PUBLIC_DATA AT_surfxml_cluster_bb___sharing___policy AX_surfxml_cluster_bb___sharing___policy; #define A_surfxml_cluster_bb___sharing___policy AX_surfxml_cluster_bb___sharing___policy -XBT_PUBLIC_DATA(short int) surfxml_cluster_bb___sharing___policy_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_bw) AX_surfxml_cluster_bw; +XBT_PUBLIC_DATA short int surfxml_cluster_bb___sharing___policy_isset; +XBT_PUBLIC_DATA AT_surfxml_cluster_bw AX_surfxml_cluster_bw; #define A_surfxml_cluster_bw (surfxml_bufferstack + AX_surfxml_cluster_bw) -XBT_PUBLIC_DATA(short int) surfxml_cluster_bw_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_core) AX_surfxml_cluster_core; +XBT_PUBLIC_DATA short int surfxml_cluster_bw_isset; +XBT_PUBLIC_DATA AT_surfxml_cluster_core AX_surfxml_cluster_core; #define A_surfxml_cluster_core (surfxml_bufferstack + AX_surfxml_cluster_core) -XBT_PUBLIC_DATA(short int) surfxml_cluster_core_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_id) AX_surfxml_cluster_id; +XBT_PUBLIC_DATA short int surfxml_cluster_core_isset; +XBT_PUBLIC_DATA AT_surfxml_cluster_id AX_surfxml_cluster_id; #define A_surfxml_cluster_id (surfxml_bufferstack + AX_surfxml_cluster_id) -XBT_PUBLIC_DATA(short int) surfxml_cluster_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_lat) AX_surfxml_cluster_lat; +XBT_PUBLIC_DATA short int surfxml_cluster_id_isset; +XBT_PUBLIC_DATA AT_surfxml_cluster_lat AX_surfxml_cluster_lat; #define A_surfxml_cluster_lat (surfxml_bufferstack + AX_surfxml_cluster_lat) -XBT_PUBLIC_DATA(short int) surfxml_cluster_lat_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_limiter___link) AX_surfxml_cluster_limiter___link; +XBT_PUBLIC_DATA short int surfxml_cluster_lat_isset; +XBT_PUBLIC_DATA AT_surfxml_cluster_limiter___link AX_surfxml_cluster_limiter___link; #define A_surfxml_cluster_limiter___link (surfxml_bufferstack + AX_surfxml_cluster_limiter___link) -XBT_PUBLIC_DATA(short int) surfxml_cluster_limiter___link_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_loopback___bw) AX_surfxml_cluster_loopback___bw; +XBT_PUBLIC_DATA short int surfxml_cluster_limiter___link_isset; +XBT_PUBLIC_DATA AT_surfxml_cluster_loopback___bw AX_surfxml_cluster_loopback___bw; #define A_surfxml_cluster_loopback___bw (surfxml_bufferstack + AX_surfxml_cluster_loopback___bw) -XBT_PUBLIC_DATA(short int) surfxml_cluster_loopback___bw_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_loopback___lat) AX_surfxml_cluster_loopback___lat; +XBT_PUBLIC_DATA short int surfxml_cluster_loopback___bw_isset; +XBT_PUBLIC_DATA AT_surfxml_cluster_loopback___lat AX_surfxml_cluster_loopback___lat; #define A_surfxml_cluster_loopback___lat (surfxml_bufferstack + AX_surfxml_cluster_loopback___lat) -XBT_PUBLIC_DATA(short int) surfxml_cluster_loopback___lat_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_prefix) AX_surfxml_cluster_prefix; +XBT_PUBLIC_DATA short int surfxml_cluster_loopback___lat_isset; +XBT_PUBLIC_DATA AT_surfxml_cluster_prefix AX_surfxml_cluster_prefix; #define A_surfxml_cluster_prefix (surfxml_bufferstack + AX_surfxml_cluster_prefix) -XBT_PUBLIC_DATA(short int) surfxml_cluster_prefix_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_radical) AX_surfxml_cluster_radical; +XBT_PUBLIC_DATA short int surfxml_cluster_prefix_isset; +XBT_PUBLIC_DATA AT_surfxml_cluster_radical AX_surfxml_cluster_radical; #define A_surfxml_cluster_radical (surfxml_bufferstack + AX_surfxml_cluster_radical) -XBT_PUBLIC_DATA(short int) surfxml_cluster_radical_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_router___id) AX_surfxml_cluster_router___id; +XBT_PUBLIC_DATA short int surfxml_cluster_radical_isset; +XBT_PUBLIC_DATA AT_surfxml_cluster_router___id AX_surfxml_cluster_router___id; #define A_surfxml_cluster_router___id (surfxml_bufferstack + AX_surfxml_cluster_router___id) -XBT_PUBLIC_DATA(short int) surfxml_cluster_router___id_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_sharing___policy) AX_surfxml_cluster_sharing___policy; +XBT_PUBLIC_DATA short int surfxml_cluster_router___id_isset; +XBT_PUBLIC_DATA AT_surfxml_cluster_sharing___policy AX_surfxml_cluster_sharing___policy; #define A_surfxml_cluster_sharing___policy AX_surfxml_cluster_sharing___policy -XBT_PUBLIC_DATA(short int) surfxml_cluster_sharing___policy_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_speed) AX_surfxml_cluster_speed; +XBT_PUBLIC_DATA short int surfxml_cluster_sharing___policy_isset; +XBT_PUBLIC_DATA AT_surfxml_cluster_speed AX_surfxml_cluster_speed; #define A_surfxml_cluster_speed (surfxml_bufferstack + AX_surfxml_cluster_speed) -XBT_PUBLIC_DATA(short int) surfxml_cluster_speed_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_suffix) AX_surfxml_cluster_suffix; +XBT_PUBLIC_DATA short int surfxml_cluster_speed_isset; +XBT_PUBLIC_DATA AT_surfxml_cluster_suffix AX_surfxml_cluster_suffix; #define A_surfxml_cluster_suffix (surfxml_bufferstack + AX_surfxml_cluster_suffix) -XBT_PUBLIC_DATA(short int) surfxml_cluster_suffix_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_topo___parameters) AX_surfxml_cluster_topo___parameters; +XBT_PUBLIC_DATA short int surfxml_cluster_suffix_isset; +XBT_PUBLIC_DATA AT_surfxml_cluster_topo___parameters AX_surfxml_cluster_topo___parameters; #define A_surfxml_cluster_topo___parameters (surfxml_bufferstack + AX_surfxml_cluster_topo___parameters) -XBT_PUBLIC_DATA(short int) surfxml_cluster_topo___parameters_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_topology) AX_surfxml_cluster_topology; +XBT_PUBLIC_DATA short int surfxml_cluster_topo___parameters_isset; +XBT_PUBLIC_DATA AT_surfxml_cluster_topology AX_surfxml_cluster_topology; #define A_surfxml_cluster_topology AX_surfxml_cluster_topology -XBT_PUBLIC_DATA(short int) surfxml_cluster_topology_isset; -XBT_PUBLIC_DATA(AT_surfxml_config_id) AX_surfxml_config_id; +XBT_PUBLIC_DATA short int surfxml_cluster_topology_isset; +XBT_PUBLIC_DATA AT_surfxml_config_id AX_surfxml_config_id; #define A_surfxml_config_id (surfxml_bufferstack + AX_surfxml_config_id) -XBT_PUBLIC_DATA(short int) surfxml_config_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_host_availability___file) AX_surfxml_host_availability___file; +XBT_PUBLIC_DATA short int surfxml_config_id_isset; +XBT_PUBLIC_DATA AT_surfxml_host_availability___file AX_surfxml_host_availability___file; #define A_surfxml_host_availability___file (surfxml_bufferstack + AX_surfxml_host_availability___file) -XBT_PUBLIC_DATA(short int) surfxml_host_availability___file_isset; -XBT_PUBLIC_DATA(AT_surfxml_host_coordinates) AX_surfxml_host_coordinates; +XBT_PUBLIC_DATA short int surfxml_host_availability___file_isset; +XBT_PUBLIC_DATA AT_surfxml_host_coordinates AX_surfxml_host_coordinates; #define A_surfxml_host_coordinates (surfxml_bufferstack + AX_surfxml_host_coordinates) -XBT_PUBLIC_DATA(short int) surfxml_host_coordinates_isset; -XBT_PUBLIC_DATA(AT_surfxml_host_core) AX_surfxml_host_core; +XBT_PUBLIC_DATA short int surfxml_host_coordinates_isset; +XBT_PUBLIC_DATA AT_surfxml_host_core AX_surfxml_host_core; #define A_surfxml_host_core (surfxml_bufferstack + AX_surfxml_host_core) -XBT_PUBLIC_DATA(short int) surfxml_host_core_isset; -XBT_PUBLIC_DATA(AT_surfxml_host_id) AX_surfxml_host_id; +XBT_PUBLIC_DATA short int surfxml_host_core_isset; +XBT_PUBLIC_DATA AT_surfxml_host_id AX_surfxml_host_id; #define A_surfxml_host_id (surfxml_bufferstack + AX_surfxml_host_id) -XBT_PUBLIC_DATA(short int) surfxml_host_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_host_pstate) AX_surfxml_host_pstate; +XBT_PUBLIC_DATA short int surfxml_host_id_isset; +XBT_PUBLIC_DATA AT_surfxml_host_pstate AX_surfxml_host_pstate; #define A_surfxml_host_pstate (surfxml_bufferstack + AX_surfxml_host_pstate) -XBT_PUBLIC_DATA(short int) surfxml_host_pstate_isset; -XBT_PUBLIC_DATA(AT_surfxml_host_speed) AX_surfxml_host_speed; +XBT_PUBLIC_DATA short int surfxml_host_pstate_isset; +XBT_PUBLIC_DATA AT_surfxml_host_speed AX_surfxml_host_speed; #define A_surfxml_host_speed (surfxml_bufferstack + AX_surfxml_host_speed) -XBT_PUBLIC_DATA(short int) surfxml_host_speed_isset; -XBT_PUBLIC_DATA(AT_surfxml_host_state___file) AX_surfxml_host_state___file; +XBT_PUBLIC_DATA short int surfxml_host_speed_isset; +XBT_PUBLIC_DATA AT_surfxml_host_state___file AX_surfxml_host_state___file; #define A_surfxml_host_state___file (surfxml_bufferstack + AX_surfxml_host_state___file) -XBT_PUBLIC_DATA(short int) surfxml_host_state___file_isset; -XBT_PUBLIC_DATA(AT_surfxml_host___link_down) AX_surfxml_host___link_down; +XBT_PUBLIC_DATA short int surfxml_host_state___file_isset; +XBT_PUBLIC_DATA AT_surfxml_host___link_down AX_surfxml_host___link_down; #define A_surfxml_host___link_down (surfxml_bufferstack + AX_surfxml_host___link_down) -XBT_PUBLIC_DATA(short int) surfxml_host___link_down_isset; -XBT_PUBLIC_DATA(AT_surfxml_host___link_id) AX_surfxml_host___link_id; +XBT_PUBLIC_DATA short int surfxml_host___link_down_isset; +XBT_PUBLIC_DATA AT_surfxml_host___link_id AX_surfxml_host___link_id; #define A_surfxml_host___link_id (surfxml_bufferstack + AX_surfxml_host___link_id) -XBT_PUBLIC_DATA(short int) surfxml_host___link_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_host___link_up) AX_surfxml_host___link_up; +XBT_PUBLIC_DATA short int surfxml_host___link_id_isset; +XBT_PUBLIC_DATA AT_surfxml_host___link_up AX_surfxml_host___link_up; #define A_surfxml_host___link_up (surfxml_bufferstack + AX_surfxml_host___link_up) -XBT_PUBLIC_DATA(short int) surfxml_host___link_up_isset; -XBT_PUBLIC_DATA(AT_surfxml_include_file) AX_surfxml_include_file; +XBT_PUBLIC_DATA short int surfxml_host___link_up_isset; +XBT_PUBLIC_DATA AT_surfxml_include_file AX_surfxml_include_file; #define A_surfxml_include_file (surfxml_bufferstack + AX_surfxml_include_file) -XBT_PUBLIC_DATA(short int) surfxml_include_file_isset; -XBT_PUBLIC_DATA(AT_surfxml_link_bandwidth) AX_surfxml_link_bandwidth; +XBT_PUBLIC_DATA short int surfxml_include_file_isset; +XBT_PUBLIC_DATA AT_surfxml_link_bandwidth AX_surfxml_link_bandwidth; #define A_surfxml_link_bandwidth (surfxml_bufferstack + AX_surfxml_link_bandwidth) -XBT_PUBLIC_DATA(short int) surfxml_link_bandwidth_isset; -XBT_PUBLIC_DATA(AT_surfxml_link_bandwidth___file) AX_surfxml_link_bandwidth___file; +XBT_PUBLIC_DATA short int surfxml_link_bandwidth_isset; +XBT_PUBLIC_DATA AT_surfxml_link_bandwidth___file AX_surfxml_link_bandwidth___file; #define A_surfxml_link_bandwidth___file (surfxml_bufferstack + AX_surfxml_link_bandwidth___file) -XBT_PUBLIC_DATA(short int) surfxml_link_bandwidth___file_isset; -XBT_PUBLIC_DATA(AT_surfxml_link_id) AX_surfxml_link_id; +XBT_PUBLIC_DATA short int surfxml_link_bandwidth___file_isset; +XBT_PUBLIC_DATA AT_surfxml_link_id AX_surfxml_link_id; #define A_surfxml_link_id (surfxml_bufferstack + AX_surfxml_link_id) -XBT_PUBLIC_DATA(short int) surfxml_link_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_link_latency) AX_surfxml_link_latency; +XBT_PUBLIC_DATA short int surfxml_link_id_isset; +XBT_PUBLIC_DATA AT_surfxml_link_latency AX_surfxml_link_latency; #define A_surfxml_link_latency (surfxml_bufferstack + AX_surfxml_link_latency) -XBT_PUBLIC_DATA(short int) surfxml_link_latency_isset; -XBT_PUBLIC_DATA(AT_surfxml_link_latency___file) AX_surfxml_link_latency___file; +XBT_PUBLIC_DATA short int surfxml_link_latency_isset; +XBT_PUBLIC_DATA AT_surfxml_link_latency___file AX_surfxml_link_latency___file; #define A_surfxml_link_latency___file (surfxml_bufferstack + AX_surfxml_link_latency___file) -XBT_PUBLIC_DATA(short int) surfxml_link_latency___file_isset; -XBT_PUBLIC_DATA(AT_surfxml_link_sharing___policy) AX_surfxml_link_sharing___policy; +XBT_PUBLIC_DATA short int surfxml_link_latency___file_isset; +XBT_PUBLIC_DATA AT_surfxml_link_sharing___policy AX_surfxml_link_sharing___policy; #define A_surfxml_link_sharing___policy AX_surfxml_link_sharing___policy -XBT_PUBLIC_DATA(short int) surfxml_link_sharing___policy_isset; -XBT_PUBLIC_DATA(AT_surfxml_link_state___file) AX_surfxml_link_state___file; +XBT_PUBLIC_DATA short int surfxml_link_sharing___policy_isset; +XBT_PUBLIC_DATA AT_surfxml_link_state___file AX_surfxml_link_state___file; #define A_surfxml_link_state___file (surfxml_bufferstack + AX_surfxml_link_state___file) -XBT_PUBLIC_DATA(short int) surfxml_link_state___file_isset; -XBT_PUBLIC_DATA(AT_surfxml_link___ctn_direction) AX_surfxml_link___ctn_direction; +XBT_PUBLIC_DATA short int surfxml_link_state___file_isset; +XBT_PUBLIC_DATA AT_surfxml_link___ctn_direction AX_surfxml_link___ctn_direction; #define A_surfxml_link___ctn_direction AX_surfxml_link___ctn_direction -XBT_PUBLIC_DATA(short int) surfxml_link___ctn_direction_isset; -XBT_PUBLIC_DATA(AT_surfxml_link___ctn_id) AX_surfxml_link___ctn_id; +XBT_PUBLIC_DATA short int surfxml_link___ctn_direction_isset; +XBT_PUBLIC_DATA AT_surfxml_link___ctn_id AX_surfxml_link___ctn_id; #define A_surfxml_link___ctn_id (surfxml_bufferstack + AX_surfxml_link___ctn_id) -XBT_PUBLIC_DATA(short int) surfxml_link___ctn_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_model___prop_id) AX_surfxml_model___prop_id; +XBT_PUBLIC_DATA short int surfxml_link___ctn_id_isset; +XBT_PUBLIC_DATA AT_surfxml_model___prop_id AX_surfxml_model___prop_id; #define A_surfxml_model___prop_id (surfxml_bufferstack + AX_surfxml_model___prop_id) -XBT_PUBLIC_DATA(short int) surfxml_model___prop_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_model___prop_value) AX_surfxml_model___prop_value; +XBT_PUBLIC_DATA short int surfxml_model___prop_id_isset; +XBT_PUBLIC_DATA AT_surfxml_model___prop_value AX_surfxml_model___prop_value; #define A_surfxml_model___prop_value (surfxml_bufferstack + AX_surfxml_model___prop_value) -XBT_PUBLIC_DATA(short int) surfxml_model___prop_value_isset; -XBT_PUBLIC_DATA(AT_surfxml_mount_name) AX_surfxml_mount_name; +XBT_PUBLIC_DATA short int surfxml_model___prop_value_isset; +XBT_PUBLIC_DATA AT_surfxml_mount_name AX_surfxml_mount_name; #define A_surfxml_mount_name (surfxml_bufferstack + AX_surfxml_mount_name) -XBT_PUBLIC_DATA(short int) surfxml_mount_name_isset; -XBT_PUBLIC_DATA(AT_surfxml_mount_storageId) AX_surfxml_mount_storageId; +XBT_PUBLIC_DATA short int surfxml_mount_name_isset; +XBT_PUBLIC_DATA AT_surfxml_mount_storageId AX_surfxml_mount_storageId; #define A_surfxml_mount_storageId (surfxml_bufferstack + AX_surfxml_mount_storageId) -XBT_PUBLIC_DATA(short int) surfxml_mount_storageId_isset; -XBT_PUBLIC_DATA(AT_surfxml_peer_availability___file) AX_surfxml_peer_availability___file; +XBT_PUBLIC_DATA short int surfxml_mount_storageId_isset; +XBT_PUBLIC_DATA AT_surfxml_peer_availability___file AX_surfxml_peer_availability___file; #define A_surfxml_peer_availability___file (surfxml_bufferstack + AX_surfxml_peer_availability___file) -XBT_PUBLIC_DATA(short int) surfxml_peer_availability___file_isset; -XBT_PUBLIC_DATA(AT_surfxml_peer_bw___in) AX_surfxml_peer_bw___in; +XBT_PUBLIC_DATA short int surfxml_peer_availability___file_isset; +XBT_PUBLIC_DATA AT_surfxml_peer_bw___in AX_surfxml_peer_bw___in; #define A_surfxml_peer_bw___in (surfxml_bufferstack + AX_surfxml_peer_bw___in) -XBT_PUBLIC_DATA(short int) surfxml_peer_bw___in_isset; -XBT_PUBLIC_DATA(AT_surfxml_peer_bw___out) AX_surfxml_peer_bw___out; +XBT_PUBLIC_DATA short int surfxml_peer_bw___in_isset; +XBT_PUBLIC_DATA AT_surfxml_peer_bw___out AX_surfxml_peer_bw___out; #define A_surfxml_peer_bw___out (surfxml_bufferstack + AX_surfxml_peer_bw___out) -XBT_PUBLIC_DATA(short int) surfxml_peer_bw___out_isset; -XBT_PUBLIC_DATA(AT_surfxml_peer_coordinates) AX_surfxml_peer_coordinates; +XBT_PUBLIC_DATA short int surfxml_peer_bw___out_isset; +XBT_PUBLIC_DATA AT_surfxml_peer_coordinates AX_surfxml_peer_coordinates; #define A_surfxml_peer_coordinates (surfxml_bufferstack + AX_surfxml_peer_coordinates) -XBT_PUBLIC_DATA(short int) surfxml_peer_coordinates_isset; -XBT_PUBLIC_DATA(AT_surfxml_peer_id) AX_surfxml_peer_id; +XBT_PUBLIC_DATA short int surfxml_peer_coordinates_isset; +XBT_PUBLIC_DATA AT_surfxml_peer_id AX_surfxml_peer_id; #define A_surfxml_peer_id (surfxml_bufferstack + AX_surfxml_peer_id) -XBT_PUBLIC_DATA(short int) surfxml_peer_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_peer_lat) AX_surfxml_peer_lat; +XBT_PUBLIC_DATA short int surfxml_peer_id_isset; +XBT_PUBLIC_DATA AT_surfxml_peer_lat AX_surfxml_peer_lat; #define A_surfxml_peer_lat (surfxml_bufferstack + AX_surfxml_peer_lat) -XBT_PUBLIC_DATA(short int) surfxml_peer_lat_isset; -XBT_PUBLIC_DATA(AT_surfxml_peer_speed) AX_surfxml_peer_speed; +XBT_PUBLIC_DATA short int surfxml_peer_lat_isset; +XBT_PUBLIC_DATA AT_surfxml_peer_speed AX_surfxml_peer_speed; #define A_surfxml_peer_speed (surfxml_bufferstack + AX_surfxml_peer_speed) -XBT_PUBLIC_DATA(short int) surfxml_peer_speed_isset; -XBT_PUBLIC_DATA(AT_surfxml_peer_state___file) AX_surfxml_peer_state___file; +XBT_PUBLIC_DATA short int surfxml_peer_speed_isset; +XBT_PUBLIC_DATA AT_surfxml_peer_state___file AX_surfxml_peer_state___file; #define A_surfxml_peer_state___file (surfxml_bufferstack + AX_surfxml_peer_state___file) -XBT_PUBLIC_DATA(short int) surfxml_peer_state___file_isset; -XBT_PUBLIC_DATA(AT_surfxml_platform_version) AX_surfxml_platform_version; +XBT_PUBLIC_DATA short int surfxml_peer_state___file_isset; +XBT_PUBLIC_DATA AT_surfxml_platform_version AX_surfxml_platform_version; #define A_surfxml_platform_version (surfxml_bufferstack + AX_surfxml_platform_version) -XBT_PUBLIC_DATA(short int) surfxml_platform_version_isset; -XBT_PUBLIC_DATA(AT_surfxml_process_function) AX_surfxml_process_function; +XBT_PUBLIC_DATA short int surfxml_platform_version_isset; +XBT_PUBLIC_DATA AT_surfxml_process_function AX_surfxml_process_function; #define A_surfxml_process_function (surfxml_bufferstack + AX_surfxml_process_function) -XBT_PUBLIC_DATA(short int) surfxml_process_function_isset; -XBT_PUBLIC_DATA(AT_surfxml_process_host) AX_surfxml_process_host; +XBT_PUBLIC_DATA short int surfxml_process_function_isset; +XBT_PUBLIC_DATA AT_surfxml_process_host AX_surfxml_process_host; #define A_surfxml_process_host (surfxml_bufferstack + AX_surfxml_process_host) -XBT_PUBLIC_DATA(short int) surfxml_process_host_isset; -XBT_PUBLIC_DATA(AT_surfxml_process_kill___time) AX_surfxml_process_kill___time; +XBT_PUBLIC_DATA short int surfxml_process_host_isset; +XBT_PUBLIC_DATA AT_surfxml_process_kill___time AX_surfxml_process_kill___time; #define A_surfxml_process_kill___time (surfxml_bufferstack + AX_surfxml_process_kill___time) -XBT_PUBLIC_DATA(short int) surfxml_process_kill___time_isset; -XBT_PUBLIC_DATA(AT_surfxml_process_on___failure) AX_surfxml_process_on___failure; +XBT_PUBLIC_DATA short int surfxml_process_kill___time_isset; +XBT_PUBLIC_DATA AT_surfxml_process_on___failure AX_surfxml_process_on___failure; #define A_surfxml_process_on___failure AX_surfxml_process_on___failure -XBT_PUBLIC_DATA(short int) surfxml_process_on___failure_isset; -XBT_PUBLIC_DATA(AT_surfxml_process_start___time) AX_surfxml_process_start___time; +XBT_PUBLIC_DATA short int surfxml_process_on___failure_isset; +XBT_PUBLIC_DATA AT_surfxml_process_start___time AX_surfxml_process_start___time; #define A_surfxml_process_start___time (surfxml_bufferstack + AX_surfxml_process_start___time) -XBT_PUBLIC_DATA(short int) surfxml_process_start___time_isset; -XBT_PUBLIC_DATA(AT_surfxml_prop_id) AX_surfxml_prop_id; +XBT_PUBLIC_DATA short int surfxml_process_start___time_isset; +XBT_PUBLIC_DATA AT_surfxml_prop_id AX_surfxml_prop_id; #define A_surfxml_prop_id (surfxml_bufferstack + AX_surfxml_prop_id) -XBT_PUBLIC_DATA(short int) surfxml_prop_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_prop_value) AX_surfxml_prop_value; +XBT_PUBLIC_DATA short int surfxml_prop_id_isset; +XBT_PUBLIC_DATA AT_surfxml_prop_value AX_surfxml_prop_value; #define A_surfxml_prop_value (surfxml_bufferstack + AX_surfxml_prop_value) -XBT_PUBLIC_DATA(short int) surfxml_prop_value_isset; -XBT_PUBLIC_DATA(AT_surfxml_random_generator) AX_surfxml_random_generator; +XBT_PUBLIC_DATA short int surfxml_prop_value_isset; +XBT_PUBLIC_DATA AT_surfxml_random_generator AX_surfxml_random_generator; #define A_surfxml_random_generator AX_surfxml_random_generator -XBT_PUBLIC_DATA(short int) surfxml_random_generator_isset; -XBT_PUBLIC_DATA(AT_surfxml_random_id) AX_surfxml_random_id; +XBT_PUBLIC_DATA short int surfxml_random_generator_isset; +XBT_PUBLIC_DATA AT_surfxml_random_id AX_surfxml_random_id; #define A_surfxml_random_id (surfxml_bufferstack + AX_surfxml_random_id) -XBT_PUBLIC_DATA(short int) surfxml_random_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_random_max) AX_surfxml_random_max; +XBT_PUBLIC_DATA short int surfxml_random_id_isset; +XBT_PUBLIC_DATA AT_surfxml_random_max AX_surfxml_random_max; #define A_surfxml_random_max (surfxml_bufferstack + AX_surfxml_random_max) -XBT_PUBLIC_DATA(short int) surfxml_random_max_isset; -XBT_PUBLIC_DATA(AT_surfxml_random_mean) AX_surfxml_random_mean; +XBT_PUBLIC_DATA short int surfxml_random_max_isset; +XBT_PUBLIC_DATA AT_surfxml_random_mean AX_surfxml_random_mean; #define A_surfxml_random_mean (surfxml_bufferstack + AX_surfxml_random_mean) -XBT_PUBLIC_DATA(short int) surfxml_random_mean_isset; -XBT_PUBLIC_DATA(AT_surfxml_random_min) AX_surfxml_random_min; +XBT_PUBLIC_DATA short int surfxml_random_mean_isset; +XBT_PUBLIC_DATA AT_surfxml_random_min AX_surfxml_random_min; #define A_surfxml_random_min (surfxml_bufferstack + AX_surfxml_random_min) -XBT_PUBLIC_DATA(short int) surfxml_random_min_isset; -XBT_PUBLIC_DATA(AT_surfxml_random_radical) AX_surfxml_random_radical; +XBT_PUBLIC_DATA short int surfxml_random_min_isset; +XBT_PUBLIC_DATA AT_surfxml_random_radical AX_surfxml_random_radical; #define A_surfxml_random_radical (surfxml_bufferstack + AX_surfxml_random_radical) -XBT_PUBLIC_DATA(short int) surfxml_random_radical_isset; -XBT_PUBLIC_DATA(AT_surfxml_random_seed) AX_surfxml_random_seed; +XBT_PUBLIC_DATA short int surfxml_random_radical_isset; +XBT_PUBLIC_DATA AT_surfxml_random_seed AX_surfxml_random_seed; #define A_surfxml_random_seed (surfxml_bufferstack + AX_surfxml_random_seed) -XBT_PUBLIC_DATA(short int) surfxml_random_seed_isset; -XBT_PUBLIC_DATA(AT_surfxml_random_std___deviation) AX_surfxml_random_std___deviation; +XBT_PUBLIC_DATA short int surfxml_random_seed_isset; +XBT_PUBLIC_DATA AT_surfxml_random_std___deviation AX_surfxml_random_std___deviation; #define A_surfxml_random_std___deviation (surfxml_bufferstack + AX_surfxml_random_std___deviation) -XBT_PUBLIC_DATA(short int) surfxml_random_std___deviation_isset; -XBT_PUBLIC_DATA(AT_surfxml_route_dst) AX_surfxml_route_dst; +XBT_PUBLIC_DATA short int surfxml_random_std___deviation_isset; +XBT_PUBLIC_DATA AT_surfxml_route_dst AX_surfxml_route_dst; #define A_surfxml_route_dst (surfxml_bufferstack + AX_surfxml_route_dst) -XBT_PUBLIC_DATA(short int) surfxml_route_dst_isset; -XBT_PUBLIC_DATA(AT_surfxml_route_src) AX_surfxml_route_src; +XBT_PUBLIC_DATA short int surfxml_route_dst_isset; +XBT_PUBLIC_DATA AT_surfxml_route_src AX_surfxml_route_src; #define A_surfxml_route_src (surfxml_bufferstack + AX_surfxml_route_src) -XBT_PUBLIC_DATA(short int) surfxml_route_src_isset; -XBT_PUBLIC_DATA(AT_surfxml_route_symmetrical) AX_surfxml_route_symmetrical; +XBT_PUBLIC_DATA short int surfxml_route_src_isset; +XBT_PUBLIC_DATA AT_surfxml_route_symmetrical AX_surfxml_route_symmetrical; #define A_surfxml_route_symmetrical AX_surfxml_route_symmetrical -XBT_PUBLIC_DATA(short int) surfxml_route_symmetrical_isset; -XBT_PUBLIC_DATA(AT_surfxml_router_coordinates) AX_surfxml_router_coordinates; +XBT_PUBLIC_DATA short int surfxml_route_symmetrical_isset; +XBT_PUBLIC_DATA AT_surfxml_router_coordinates AX_surfxml_router_coordinates; #define A_surfxml_router_coordinates (surfxml_bufferstack + AX_surfxml_router_coordinates) -XBT_PUBLIC_DATA(short int) surfxml_router_coordinates_isset; -XBT_PUBLIC_DATA(AT_surfxml_router_id) AX_surfxml_router_id; +XBT_PUBLIC_DATA short int surfxml_router_coordinates_isset; +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(short int) surfxml_router_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_storage_attach) AX_surfxml_storage_attach; +XBT_PUBLIC_DATA short int surfxml_router_id_isset; +XBT_PUBLIC_DATA AT_surfxml_storage_attach AX_surfxml_storage_attach; #define A_surfxml_storage_attach (surfxml_bufferstack + AX_surfxml_storage_attach) -XBT_PUBLIC_DATA(short int) surfxml_storage_attach_isset; -XBT_PUBLIC_DATA(AT_surfxml_storage_content) AX_surfxml_storage_content; +XBT_PUBLIC_DATA short int surfxml_storage_attach_isset; +XBT_PUBLIC_DATA AT_surfxml_storage_content AX_surfxml_storage_content; #define A_surfxml_storage_content (surfxml_bufferstack + AX_surfxml_storage_content) -XBT_PUBLIC_DATA(short int) surfxml_storage_content_isset; -XBT_PUBLIC_DATA(AT_surfxml_storage_id) AX_surfxml_storage_id; +XBT_PUBLIC_DATA short int surfxml_storage_content_isset; +XBT_PUBLIC_DATA AT_surfxml_storage_id AX_surfxml_storage_id; #define A_surfxml_storage_id (surfxml_bufferstack + AX_surfxml_storage_id) -XBT_PUBLIC_DATA(short int) surfxml_storage_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_storage_typeId) AX_surfxml_storage_typeId; +XBT_PUBLIC_DATA short int surfxml_storage_id_isset; +XBT_PUBLIC_DATA AT_surfxml_storage_typeId AX_surfxml_storage_typeId; #define A_surfxml_storage_typeId (surfxml_bufferstack + AX_surfxml_storage_typeId) -XBT_PUBLIC_DATA(short int) surfxml_storage_typeId_isset; -XBT_PUBLIC_DATA(AT_surfxml_storage___type_content) AX_surfxml_storage___type_content; +XBT_PUBLIC_DATA short int surfxml_storage_typeId_isset; +XBT_PUBLIC_DATA AT_surfxml_storage___type_content AX_surfxml_storage___type_content; #define A_surfxml_storage___type_content (surfxml_bufferstack + AX_surfxml_storage___type_content) -XBT_PUBLIC_DATA(short int) surfxml_storage___type_content_isset; -XBT_PUBLIC_DATA(AT_surfxml_storage___type_id) AX_surfxml_storage___type_id; +XBT_PUBLIC_DATA short int surfxml_storage___type_content_isset; +XBT_PUBLIC_DATA AT_surfxml_storage___type_id AX_surfxml_storage___type_id; #define A_surfxml_storage___type_id (surfxml_bufferstack + AX_surfxml_storage___type_id) -XBT_PUBLIC_DATA(short int) surfxml_storage___type_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_storage___type_model) AX_surfxml_storage___type_model; +XBT_PUBLIC_DATA short int surfxml_storage___type_id_isset; +XBT_PUBLIC_DATA AT_surfxml_storage___type_model AX_surfxml_storage___type_model; #define A_surfxml_storage___type_model (surfxml_bufferstack + AX_surfxml_storage___type_model) -XBT_PUBLIC_DATA(short int) surfxml_storage___type_model_isset; -XBT_PUBLIC_DATA(AT_surfxml_storage___type_size) AX_surfxml_storage___type_size; +XBT_PUBLIC_DATA short int surfxml_storage___type_model_isset; +XBT_PUBLIC_DATA AT_surfxml_storage___type_size AX_surfxml_storage___type_size; #define A_surfxml_storage___type_size (surfxml_bufferstack + AX_surfxml_storage___type_size) -XBT_PUBLIC_DATA(short int) surfxml_storage___type_size_isset; -XBT_PUBLIC_DATA(AT_surfxml_trace_file) AX_surfxml_trace_file; +XBT_PUBLIC_DATA short int surfxml_storage___type_size_isset; +XBT_PUBLIC_DATA AT_surfxml_trace_file AX_surfxml_trace_file; #define A_surfxml_trace_file (surfxml_bufferstack + AX_surfxml_trace_file) -XBT_PUBLIC_DATA(short int) surfxml_trace_file_isset; -XBT_PUBLIC_DATA(AT_surfxml_trace_id) AX_surfxml_trace_id; +XBT_PUBLIC_DATA short int surfxml_trace_file_isset; +XBT_PUBLIC_DATA AT_surfxml_trace_id AX_surfxml_trace_id; #define A_surfxml_trace_id (surfxml_bufferstack + AX_surfxml_trace_id) -XBT_PUBLIC_DATA(short int) surfxml_trace_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_trace_periodicity) AX_surfxml_trace_periodicity; +XBT_PUBLIC_DATA short int surfxml_trace_id_isset; +XBT_PUBLIC_DATA AT_surfxml_trace_periodicity AX_surfxml_trace_periodicity; #define A_surfxml_trace_periodicity (surfxml_bufferstack + AX_surfxml_trace_periodicity) -XBT_PUBLIC_DATA(short int) surfxml_trace_periodicity_isset; -XBT_PUBLIC_DATA(AT_surfxml_trace___connect_element) AX_surfxml_trace___connect_element; +XBT_PUBLIC_DATA short int surfxml_trace_periodicity_isset; +XBT_PUBLIC_DATA AT_surfxml_trace___connect_element AX_surfxml_trace___connect_element; #define A_surfxml_trace___connect_element (surfxml_bufferstack + AX_surfxml_trace___connect_element) -XBT_PUBLIC_DATA(short int) surfxml_trace___connect_element_isset; -XBT_PUBLIC_DATA(AT_surfxml_trace___connect_kind) AX_surfxml_trace___connect_kind; +XBT_PUBLIC_DATA short int surfxml_trace___connect_element_isset; +XBT_PUBLIC_DATA AT_surfxml_trace___connect_kind AX_surfxml_trace___connect_kind; #define A_surfxml_trace___connect_kind AX_surfxml_trace___connect_kind -XBT_PUBLIC_DATA(short int) surfxml_trace___connect_kind_isset; -XBT_PUBLIC_DATA(AT_surfxml_trace___connect_trace) AX_surfxml_trace___connect_trace; +XBT_PUBLIC_DATA short int surfxml_trace___connect_kind_isset; +XBT_PUBLIC_DATA AT_surfxml_trace___connect_trace AX_surfxml_trace___connect_trace; #define A_surfxml_trace___connect_trace (surfxml_bufferstack + AX_surfxml_trace___connect_trace) -XBT_PUBLIC_DATA(short int) surfxml_trace___connect_trace_isset; -XBT_PUBLIC_DATA(AT_surfxml_zone_id) AX_surfxml_zone_id; +XBT_PUBLIC_DATA short int surfxml_trace___connect_trace_isset; +XBT_PUBLIC_DATA AT_surfxml_zone_id AX_surfxml_zone_id; #define A_surfxml_zone_id (surfxml_bufferstack + AX_surfxml_zone_id) -XBT_PUBLIC_DATA(short int) surfxml_zone_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_zone_routing) AX_surfxml_zone_routing; +XBT_PUBLIC_DATA short int surfxml_zone_id_isset; +XBT_PUBLIC_DATA AT_surfxml_zone_routing AX_surfxml_zone_routing; #define A_surfxml_zone_routing AX_surfxml_zone_routing -XBT_PUBLIC_DATA(short int) surfxml_zone_routing_isset; -XBT_PUBLIC_DATA(AT_surfxml_zoneRoute_dst) AX_surfxml_zoneRoute_dst; +XBT_PUBLIC_DATA short int surfxml_zone_routing_isset; +XBT_PUBLIC_DATA AT_surfxml_zoneRoute_dst AX_surfxml_zoneRoute_dst; #define A_surfxml_zoneRoute_dst (surfxml_bufferstack + AX_surfxml_zoneRoute_dst) -XBT_PUBLIC_DATA(short int) surfxml_zoneRoute_dst_isset; -XBT_PUBLIC_DATA(AT_surfxml_zoneRoute_gw___dst) AX_surfxml_zoneRoute_gw___dst; +XBT_PUBLIC_DATA short int surfxml_zoneRoute_dst_isset; +XBT_PUBLIC_DATA AT_surfxml_zoneRoute_gw___dst AX_surfxml_zoneRoute_gw___dst; #define A_surfxml_zoneRoute_gw___dst (surfxml_bufferstack + AX_surfxml_zoneRoute_gw___dst) -XBT_PUBLIC_DATA(short int) surfxml_zoneRoute_gw___dst_isset; -XBT_PUBLIC_DATA(AT_surfxml_zoneRoute_gw___src) AX_surfxml_zoneRoute_gw___src; +XBT_PUBLIC_DATA short int surfxml_zoneRoute_gw___dst_isset; +XBT_PUBLIC_DATA AT_surfxml_zoneRoute_gw___src AX_surfxml_zoneRoute_gw___src; #define A_surfxml_zoneRoute_gw___src (surfxml_bufferstack + AX_surfxml_zoneRoute_gw___src) -XBT_PUBLIC_DATA(short int) surfxml_zoneRoute_gw___src_isset; -XBT_PUBLIC_DATA(AT_surfxml_zoneRoute_src) AX_surfxml_zoneRoute_src; +XBT_PUBLIC_DATA short int surfxml_zoneRoute_gw___src_isset; +XBT_PUBLIC_DATA AT_surfxml_zoneRoute_src AX_surfxml_zoneRoute_src; #define A_surfxml_zoneRoute_src (surfxml_bufferstack + AX_surfxml_zoneRoute_src) -XBT_PUBLIC_DATA(short int) surfxml_zoneRoute_src_isset; -XBT_PUBLIC_DATA(AT_surfxml_zoneRoute_symmetrical) AX_surfxml_zoneRoute_symmetrical; +XBT_PUBLIC_DATA short int surfxml_zoneRoute_src_isset; +XBT_PUBLIC_DATA AT_surfxml_zoneRoute_symmetrical AX_surfxml_zoneRoute_symmetrical; #define A_surfxml_zoneRoute_symmetrical AX_surfxml_zoneRoute_symmetrical -XBT_PUBLIC_DATA(short int) surfxml_zoneRoute_symmetrical_isset; +XBT_PUBLIC_DATA short int surfxml_zoneRoute_symmetrical_isset; /* XML application utilities. */ XBT_PUBLIC int surfxml_element_context(int); diff --git a/src/xbt/config.cpp b/src/xbt/config.cpp index 242483ba4f..1e6a84b675 100644 --- a/src/xbt/config.cpp +++ b/src/xbt/config.cpp @@ -760,7 +760,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_cfg); XBT_TEST_SUITE("config", "Configuration support"); -XBT_PUBLIC_DATA(xbt_cfg_t) simgrid_config; +XBT_PUBLIC_DATA xbt_cfg_t simgrid_config; static void make_set() { diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h index e42acccd59..4854410fe6 100644 --- a/src/xbt/mmalloc/mmprivate.h +++ b/src/xbt/mmalloc/mmprivate.h @@ -277,7 +277,7 @@ struct mdesc { /* A default malloc descriptor for the single sbrk() managed region. */ -XBT_PUBLIC_DATA( struct mdesc ) *__mmalloc_default_mdp; +XBT_PUBLIC_DATA struct mdesc* __mmalloc_default_mdp; /* Remap a mmalloc region that was previously mapped. */ diff --git a/tools/cmake/MaintainerMode.cmake b/tools/cmake/MaintainerMode.cmake index 680eb7bfec..e279ee15fe 100644 --- a/tools/cmake/MaintainerMode.cmake +++ b/tools/cmake/MaintainerMode.cmake @@ -157,8 +157,8 @@ if(enable_maintainer_mode AND NOT WIN32) ENDIF() - set(string1 "'s/extern *\\([^(]*\\)\\( \\|\\( \\*\\)\\)/XBT_PUBLIC_DATA(\\1\\3) /'") - set(string2 "'s/XBT_PUBLIC_DATA(\\([^)]*\\)) *\\([^(]*\\)(/XBT_PUBLIC \\1 \\2(/'") + set(string1 "'s/extern /XBT_PUBLIC_DATA /'") + set(string2 "'s/XBT_PUBLIC_DATA \\([^(]*\\)(/XBT_PUBLIC \\1(/'") set(string5 "'s/SET(DOCTYPE)/SET(ROOT_dax__adag)/'") set(string9 "'s/#include /#if defined(_WIN32)\\n# ifndef __STRICT_ANSI__\\n# include \\n# include \\n# endif\\n#else\\n# include \\n#endif/g'") set(string14 "'\\!^ \\* Generated [0-9/]\\{10\\} [0-9:]\\{8\\}\\.$$!d'")