The parenthesis of SG_BEGIN_DECL fools doxygen. Get rid of them

diff --git a/include/simgrid/actor.h b/include/simgrid/actor.h
index 3703f10..473a10d 100644 (file)
--- a/include/simgrid/actor.h
+++ b/include/simgrid/actor.h
@@ -11,7 +11,7 @@
 #include <xbt/dict.h>
 
 /* C interface */
 #include <xbt/dict.h>
 
 /* C interface */

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 /** @brief Actor datatype.
     @ingroup m_actor_management
 
 /** @brief Actor datatype.
     @ingroup m_actor_management
 


@@ -54,6 +54,6 @@ XBT_PUBLIC void sg_actor_unref(sg_actor_t actor);
 XBT_PUBLIC void* sg_actor_data(sg_actor_t actor);
 XBT_PUBLIC void sg_actor_data_set(sg_actor_t actor, void* userdata);
 
 XBT_PUBLIC void* sg_actor_data(sg_actor_t actor);
 XBT_PUBLIC void sg_actor_data_set(sg_actor_t actor, void* userdata);
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif /* INCLUDE_SIMGRID_ACTOR_H_ */
 
 #endif /* INCLUDE_SIMGRID_ACTOR_H_ */

diff --git a/include/simgrid/barrier.h b/include/simgrid/barrier.h
index 2837633..83347fe 100644 (file)
--- a/include/simgrid/barrier.h
+++ b/include/simgrid/barrier.h
@@ -17,12 +17,12 @@ constexpr int SG_BARRIER_SERIAL_THREAD = -1;
 #endif
 
 /* C interface */
 #endif
 
 /* C interface */

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 XBT_PUBLIC sg_bar_t sg_barrier_init(unsigned int count);
 XBT_PUBLIC void sg_barrier_destroy(sg_bar_t bar);
 XBT_PUBLIC int sg_barrier_wait(sg_bar_t bar);
 
 
 XBT_PUBLIC sg_bar_t sg_barrier_init(unsigned int count);
 XBT_PUBLIC void sg_barrier_destroy(sg_bar_t bar);
 XBT_PUBLIC int sg_barrier_wait(sg_bar_t bar);
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif /* INCLUDE_SIMGRID_BARRIER_H_ */
 
 #endif /* INCLUDE_SIMGRID_BARRIER_H_ */

diff --git a/include/simgrid/cond.h b/include/simgrid/cond.h
index 08c3318..2bdfc41 100644 (file)
--- a/include/simgrid/cond.h
+++ b/include/simgrid/cond.h
@@ -9,7 +9,7 @@
 #include <simgrid/forward.h>
 
 /* C interface */
 #include <simgrid/forward.h>
 
 /* C interface */

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 /** @brief Creates a condition variable */
 XBT_PUBLIC sg_cond_t sg_cond_init();
 
 /** @brief Creates a condition variable */
 XBT_PUBLIC sg_cond_t sg_cond_init();
 


@@ -25,6 +25,6 @@ XBT_PUBLIC void sg_cond_notify_all(sg_cond_t cond);
 /** @brief Destroys the given mutex variable */
 XBT_PUBLIC void sg_cond_destroy(sg_cond_t cond);
 
 /** @brief Destroys the given mutex variable */
 XBT_PUBLIC void sg_cond_destroy(sg_cond_t cond);
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif /* INCLUDE_SIMGRID_COND_H_ */
 
 #endif /* INCLUDE_SIMGRID_COND_H_ */

diff --git a/include/simgrid/config.h.in b/include/simgrid/config.h.in
index 37ce363..6fd16ee 100644 (file)
--- a/include/simgrid/config.h.in
+++ b/include/simgrid/config.h.in
@@ -16,14 +16,14 @@
 #define SIMGRID_VERSION_PATCH @SIMGRID_VERSION_PATCH@
 #define SIMGRID_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
 
 #define SIMGRID_VERSION_PATCH @SIMGRID_VERSION_PATCH@
 #define SIMGRID_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 /** Retrieves the version numbers of the used dynamic library (so, DLL or dynlib), while
     SIMGRID_VERSION_MAJOR and friends give the version numbers of the used header files */
 XBT_PUBLIC void sg_version_get(int* major, int* minor, int* patch);
 
 /** Display the version information and some additional blurb. */
 XBT_PUBLIC void sg_version();
 /** Retrieves the version numbers of the used dynamic library (so, DLL or dynlib), while
     SIMGRID_VERSION_MAJOR and friends give the version numbers of the used header files */
 XBT_PUBLIC void sg_version_get(int* major, int* minor, int* patch);
 
 /** Display the version information and some additional blurb. */
 XBT_PUBLIC void sg_version();

-SG_END_DECL()
+SG_END_DECL

 
 
 /* Version as a single integer. v3.4 is 30400, v3.16.2 is 31602, v42 will be 420000, and so on. */
 
 
 /* Version as a single integer. v3.4 is 30400, v3.16.2 is 31602, v42 will be 420000, and so on. */

diff --git a/include/simgrid/engine.h b/include/simgrid/engine.h
index e946b5c..d4caeec 100644 (file)
--- a/include/simgrid/engine.h
+++ b/include/simgrid/engine.h
@@ -9,7 +9,7 @@
 #include <simgrid/forward.h>
 
 /* C interface */
 #include <simgrid/forward.h>
 
 /* C interface */

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 XBT_PUBLIC void simgrid_init(int* argc, char** argv);
 XBT_PUBLIC void simgrid_load_platform(const char* filename);
 XBT_PUBLIC void simgrid_load_deployment(const char* filename);
 XBT_PUBLIC void simgrid_init(int* argc, char** argv);
 XBT_PUBLIC void simgrid_load_platform(const char* filename);
 XBT_PUBLIC void simgrid_load_deployment(const char* filename);


@@ -19,6 +19,6 @@ XBT_PUBLIC void simgrid_register_default(int (*code)(int, char**));
 XBT_PUBLIC double simgrid_get_clock();
 
 XBT_PUBLIC void sg_config_continue_after_help();
 XBT_PUBLIC double simgrid_get_clock();
 
 XBT_PUBLIC void sg_config_continue_after_help();

-SG_END_DECL()
+SG_END_DECL

 
 #endif /* INCLUDE_SIMGRID_ENGINE_H_ */
 
 #endif /* INCLUDE_SIMGRID_ENGINE_H_ */

diff --git a/include/simgrid/host.h b/include/simgrid/host.h
index 368531c..a7cce00 100644 (file)
--- a/include/simgrid/host.h
+++ b/include/simgrid/host.h
@@ -10,7 +10,7 @@
 #include <xbt/dynar.h>
 #include <simgrid/forward.h>
 
 #include <xbt/dynar.h>
 #include <simgrid/forward.h>
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 /** @brief Host datatype.
  *
  *   A <em>location</em> (or <em>host</em>) is any possible place where an actor may run. Thus it is represented as a
 /** @brief Host datatype.
  *
  *   A <em>location</em> (or <em>host</em>) is any possible place where an actor may run. Thus it is represented as a


@@ -139,6 +139,6 @@ void sg_host_send_to(sg_host_t from, sg_host_t to, double byte_amount);
 XBT_PUBLIC void sg_host_dump(sg_host_t ws);
 
 XBT_PUBLIC void sg_host_get_actor_list(sg_host_t host, xbt_dynar_t whereto);
 XBT_PUBLIC void sg_host_dump(sg_host_t ws);
 
 XBT_PUBLIC void sg_host_get_actor_list(sg_host_t host, xbt_dynar_t whereto);

-SG_END_DECL()
+SG_END_DECL

 
 #endif /* SIMGRID_HOST_H_ */
 
 #endif /* SIMGRID_HOST_H_ */

diff --git a/include/simgrid/instr.h b/include/simgrid/instr.h
index 664f90b..211df99 100644 (file)
--- a/include/simgrid/instr.h
+++ b/include/simgrid/instr.h
@@ -8,7 +8,7 @@
 
 #include <simgrid/msg.h>
 
 
 #include <simgrid/msg.h>
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 /* Functions to manage tracing categories */
 XBT_PUBLIC void TRACE_category(const char* category);
 
 /* Functions to manage tracing categories */
 XBT_PUBLIC void TRACE_category(const char* category);


@@ -80,6 +80,6 @@ XBT_PUBLIC void TRACE_host_pop_state(const char* host, const char* state);
 XBT_PUBLIC xbt_dynar_t TRACE_get_node_types();
 XBT_PUBLIC xbt_dynar_t TRACE_get_edge_types();
 
 XBT_PUBLIC xbt_dynar_t TRACE_get_node_types();
 XBT_PUBLIC xbt_dynar_t TRACE_get_edge_types();
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif                          /* INSTR_H_ */
 
 #endif                          /* INSTR_H_ */

diff --git a/include/simgrid/jedule/jedule_sd_binding.h b/include/simgrid/jedule/jedule_sd_binding.h
index a6826e6..c570bfc 100644 (file)
--- a/include/simgrid/jedule/jedule_sd_binding.h
+++ b/include/simgrid/jedule/jedule_sd_binding.h
@@ -8,11 +8,11 @@
 
 #include <simgrid/simdag.h>
 
 
 #include <simgrid/simdag.h>
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 XBT_PUBLIC void jedule_log_sd_event(SD_task_t task);
 XBT_PUBLIC void jedule_sd_init(void);
 XBT_PUBLIC void jedule_sd_exit(void);
 XBT_PUBLIC void jedule_sd_dump(const char* filename);
 XBT_PUBLIC void jedule_log_sd_event(SD_task_t task);
 XBT_PUBLIC void jedule_sd_init(void);
 XBT_PUBLIC void jedule_sd_exit(void);
 XBT_PUBLIC void jedule_sd_dump(const char* filename);

-SG_END_DECL()
+SG_END_DECL

 
 #endif /* JEDULE_SD_BINDING_H_ */
 
 #endif /* JEDULE_SD_BINDING_H_ */

diff --git a/include/simgrid/link.h b/include/simgrid/link.h
index a7280a6..2664a53 100644 (file)
--- a/include/simgrid/link.h
+++ b/include/simgrid/link.h
@@ -12,7 +12,7 @@
 #include <xbt/base.h>
 
 /* C interface */
 #include <xbt/base.h>
 
 /* C interface */

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 XBT_PUBLIC const char* sg_link_name(sg_link_t link);
 XBT_PUBLIC sg_link_t sg_link_by_name(const char* name);
 XBT_PUBLIC int sg_link_is_shared(sg_link_t link);
 XBT_PUBLIC const char* sg_link_name(sg_link_t link);
 XBT_PUBLIC sg_link_t sg_link_by_name(const char* name);
 XBT_PUBLIC int sg_link_is_shared(sg_link_t link);


@@ -22,6 +22,6 @@ XBT_PUBLIC void* sg_link_data(sg_link_t link);
 XBT_PUBLIC void sg_link_data_set(sg_link_t link, void* data);
 XBT_PUBLIC int sg_link_count();
 XBT_PUBLIC sg_link_t* sg_link_list();
 XBT_PUBLIC void sg_link_data_set(sg_link_t link, void* data);
 XBT_PUBLIC int sg_link_count();
 XBT_PUBLIC sg_link_t* sg_link_list();

-SG_END_DECL()
+SG_END_DECL

 
 #endif /* INCLUDE_SIMGRID_LINK_H_ */
 
 #endif /* INCLUDE_SIMGRID_LINK_H_ */

diff --git a/include/simgrid/mailbox.h b/include/simgrid/mailbox.h
index 4bae8cb..a21900a 100644 (file)
--- a/include/simgrid/mailbox.h
+++ b/include/simgrid/mailbox.h
@@ -10,11 +10,11 @@
 #include <xbt/base.h>
 
 /* C interface */
 #include <xbt/base.h>
 
 /* C interface */

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 XBT_PUBLIC void sg_mailbox_set_receiver(const char* alias);
 XBT_PUBLIC int sg_mailbox_listen(const char* alias);
 
 
 XBT_PUBLIC void sg_mailbox_set_receiver(const char* alias);
 XBT_PUBLIC int sg_mailbox_listen(const char* alias);
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif /* INCLUDE_SIMGRID_MAILBOX_H_ */
 
 #endif /* INCLUDE_SIMGRID_MAILBOX_H_ */

diff --git a/include/simgrid/modelchecker.h b/include/simgrid/modelchecker.h
index 2ddf8a9..b4eb10c 100644 (file)
--- a/include/simgrid/modelchecker.h
+++ b/include/simgrid/modelchecker.h
@@ -19,7 +19,7 @@
 
 #include <stddef.h> /* size_t */
 
 
 #include <stddef.h> /* size_t */
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 XBT_PUBLIC int MC_random(int min, int max);
 
 
 XBT_PUBLIC int MC_random(int min, int max);
 


@@ -67,6 +67,6 @@ XBT_PUBLIC void MC_ignore_global_variable(const char* var_name);
 
 #endif
 
 
 #endif
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif /* SIMGRID_MODELCHECKER_H */
 
 #endif /* SIMGRID_MODELCHECKER_H */

diff --git a/include/simgrid/mutex.h b/include/simgrid/mutex.h
index 47222d9..29ca335 100644 (file)
--- a/include/simgrid/mutex.h
+++ b/include/simgrid/mutex.h
@@ -9,13 +9,13 @@
 #include <simgrid/forward.h>
 
 /* C interface */
 #include <simgrid/forward.h>
 
 /* C interface */

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 XBT_PUBLIC sg_mutex_t sg_mutex_init();
 XBT_PUBLIC void sg_mutex_lock(sg_mutex_t mutex);
 XBT_PUBLIC void sg_mutex_unlock(sg_mutex_t mutex);
 XBT_PUBLIC int sg_mutex_try_lock(sg_mutex_t mutex);
 XBT_PUBLIC void sg_mutex_destroy(sg_mutex_t mutex);
 
 XBT_PUBLIC sg_mutex_t sg_mutex_init();
 XBT_PUBLIC void sg_mutex_lock(sg_mutex_t mutex);
 XBT_PUBLIC void sg_mutex_unlock(sg_mutex_t mutex);
 XBT_PUBLIC int sg_mutex_try_lock(sg_mutex_t mutex);
 XBT_PUBLIC void sg_mutex_destroy(sg_mutex_t mutex);
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif /* INCLUDE_SIMGRID_MUTEX_H_ */
 
 #endif /* INCLUDE_SIMGRID_MUTEX_H_ */

diff --git a/include/simgrid/plugins/dvfs.h b/include/simgrid/plugins/dvfs.h
index 70a8392..ba35740 100644 (file)
--- a/include/simgrid/plugins/dvfs.h
+++ b/include/simgrid/plugins/dvfs.h
@@ -10,12 +10,12 @@
 #include <simgrid/forward.h>
 #include <xbt/base.h>
 
 #include <simgrid/forward.h>
 #include <xbt/base.h>
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 XBT_PUBLIC void sg_host_dvfs_plugin_init();
 
 #define MSG_host_dvfs_plugin_init() sg_host_dvfs_plugin_init()
 
 
 XBT_PUBLIC void sg_host_dvfs_plugin_init();
 
 #define MSG_host_dvfs_plugin_init() sg_host_dvfs_plugin_init()
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif
 
 #endif

diff --git a/include/simgrid/plugins/energy.h b/include/simgrid/plugins/energy.h
index 3bf3429..630d327 100644 (file)
--- a/include/simgrid/plugins/energy.h
+++ b/include/simgrid/plugins/energy.h
@@ -9,7 +9,7 @@
 #include <xbt/base.h>
 #include <simgrid/forward.h>
 
 #include <xbt/base.h>
 #include <simgrid/forward.h>
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 XBT_PUBLIC void sg_host_energy_plugin_init();
 XBT_PUBLIC void sg_host_energy_update_all();
 
 XBT_PUBLIC void sg_host_energy_plugin_init();
 XBT_PUBLIC void sg_host_energy_update_all();


@@ -34,6 +34,6 @@ XBT_PUBLIC int sg_link_energy_is_inited();
 #define MSG_host_get_power_range_slope_at(host,pstate) sg_host_get_power_range_slope_at((host), (pstate))
 #define MSG_host_get_current_consumption(host) sg_host_get_current_consumption(host)
 
 #define MSG_host_get_power_range_slope_at(host,pstate) sg_host_get_power_range_slope_at((host), (pstate))
 #define MSG_host_get_current_consumption(host) sg_host_get_current_consumption(host)
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif
 
 #endif

diff --git a/include/simgrid/plugins/file_system.h b/include/simgrid/plugins/file_system.h
index d33ac81..a0b6fae 100644 (file)
--- a/include/simgrid/plugins/file_system.h
+++ b/include/simgrid/plugins/file_system.h
@@ -22,7 +22,7 @@
 ////////////////
 typedef sg_file_t msg_file_t; // MSG backwards compatibility
 
 ////////////////
 typedef sg_file_t msg_file_t; // MSG backwards compatibility
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 XBT_PUBLIC void sg_storage_file_system_init();
 XBT_PUBLIC sg_file_t sg_file_open(const char* fullpath, void* data);
 XBT_PUBLIC sg_size_t sg_file_read(sg_file_t fd, sg_size_t size);
 XBT_PUBLIC void sg_storage_file_system_init();
 XBT_PUBLIC sg_file_t sg_file_open(const char* fullpath, void* data);
 XBT_PUBLIC sg_size_t sg_file_read(sg_file_t fd, sg_size_t size);


@@ -77,7 +77,7 @@ XBT_PUBLIC xbt_dict_t sg_host_get_storage_content(sg_host_t host);
 
 #define MSG_host_get_storage_content(st) sg_host_get_storage_content(st)
 
 
 #define MSG_host_get_storage_content(st) sg_host_get_storage_content(st)
 

-SG_END_DECL()
+SG_END_DECL

 
 // C++ interface
 //////////////////
 
 // C++ interface
 //////////////////

diff --git a/include/simgrid/plugins/live_migration.h b/include/simgrid/plugins/live_migration.h
index 085c03b..18e747b 100644 (file)
--- a/include/simgrid/plugins/live_migration.h
+++ b/include/simgrid/plugins/live_migration.h
@@ -9,7 +9,7 @@
 #include <simgrid/forward.h>
 #include <xbt/base.h>
 
 #include <simgrid/forward.h>
 #include <xbt/base.h>
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 XBT_PUBLIC void sg_vm_live_migration_plugin_init();
 XBT_PRIVATE void sg_vm_dirty_page_tracking_init();
 
 XBT_PUBLIC void sg_vm_live_migration_plugin_init();
 XBT_PRIVATE void sg_vm_dirty_page_tracking_init();


@@ -36,6 +36,6 @@ XBT_PUBLIC sg_vm_t sg_vm_create_migratable(sg_host_t pm, const char* name, int c
 #define MSG_vm_is_migrating(vm) sg_vm_is_migrating(vm)
 #define MSG_vm_migrate(vm, dst_pm) sg_vm_migrate((vm), (dst_pm))
 
 #define MSG_vm_is_migrating(vm) sg_vm_is_migrating(vm)
 #define MSG_vm_migrate(vm, dst_pm) sg_vm_migrate((vm), (dst_pm))
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif
 
 #endif

diff --git a/include/simgrid/plugins/load.h b/include/simgrid/plugins/load.h
index 75f3019..8880e9d 100644 (file)
--- a/include/simgrid/plugins/load.h
+++ b/include/simgrid/plugins/load.h
@@ -9,7 +9,7 @@
 #include <simgrid/forward.h>
 #include <xbt/base.h>
 
 #include <simgrid/forward.h>
 #include <xbt/base.h>
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 XBT_PUBLIC void sg_host_load_plugin_init();
 XBT_PUBLIC double sg_host_get_current_load(sg_host_t host);
 
 XBT_PUBLIC void sg_host_load_plugin_init();
 XBT_PUBLIC double sg_host_get_current_load(sg_host_t host);


@@ -28,6 +28,6 @@ XBT_PUBLIC void sg_host_load_reset(sg_host_t host);
 #define MSG_host_get_computed_flops(host) sg_host_get_computed_flops(host)
 #define MSG_host_get_avg_load(host) sg_host_get_avg_load(host)
 
 #define MSG_host_get_computed_flops(host) sg_host_get_computed_flops(host)
 #define MSG_host_get_avg_load(host) sg_host_get_avg_load(host)
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif
 
 #endif

diff --git a/include/simgrid/plugins/load_balancer.h b/include/simgrid/plugins/load_balancer.h
index 57f85be..5f34d0c 100644 (file)
--- a/include/simgrid/plugins/load_balancer.h
+++ b/include/simgrid/plugins/load_balancer.h
@@ -8,10 +8,10 @@
 #include <simgrid/forward.h>
 #include <xbt/base.h>
 
 #include <simgrid/forward.h>
 #include <xbt/base.h>
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 XBT_PUBLIC void sg_load_balancer_plugin_init();
 
 
 XBT_PUBLIC void sg_load_balancer_plugin_init();
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif
 
 #endif

diff --git a/include/simgrid/semaphore.h b/include/simgrid/semaphore.h
index d52dc91..a1eb19e 100644 (file)
--- a/include/simgrid/semaphore.h
+++ b/include/simgrid/semaphore.h
@@ -11,7 +11,7 @@
 #include <simgrid/forward.h>
 
 /* C interface */
 #include <simgrid/forward.h>
 
 /* C interface */

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 XBT_PUBLIC sg_sem_t sg_sem_init(int initial_value);
 XBT_PUBLIC void sg_sem_acquire(sg_sem_t sem);
 XBT_PUBLIC int sg_sem_acquire_timeout(sg_sem_t sem, double timeout);
 XBT_PUBLIC sg_sem_t sg_sem_init(int initial_value);
 XBT_PUBLIC void sg_sem_acquire(sg_sem_t sem);
 XBT_PUBLIC int sg_sem_acquire_timeout(sg_sem_t sem, double timeout);


@@ -20,6 +20,6 @@ XBT_PUBLIC int sg_sem_get_capacity(sg_sem_t sem);
 XBT_PUBLIC void sg_sem_destroy(sg_sem_t sem);
 XBT_PUBLIC int sg_sem_would_block(sg_sem_t sem);
 
 XBT_PUBLIC void sg_sem_destroy(sg_sem_t sem);
 XBT_PUBLIC int sg_sem_would_block(sg_sem_t sem);
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif /* INCLUDE_SIMGRID_SEMAPHORE_H_ */
 
 #endif /* INCLUDE_SIMGRID_SEMAPHORE_H_ */

diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h
index 5031939..4957244 100644 (file)
--- a/include/simgrid/simdag.h
+++ b/include/simgrid/simdag.h
@@ -15,7 +15,7 @@
 #include <set>
 #endif
 
 #include <set>
 #endif
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 /** @brief Link opaque datatype
     @ingroup SD_link_api
 
 /** @brief Link opaque datatype
     @ingroup SD_link_api


@@ -195,7 +195,7 @@ XBT_PUBLIC xbt_dynar_t SD_PTG_dotload(const char* filename);
 //SD_route_get_size
 //SD_route_get_list
 //TRACE_sd_set_task_category
 //SD_route_get_size
 //SD_route_get_list
 //TRACE_sd_set_task_category

-SG_END_DECL()
+SG_END_DECL

 
 #ifdef __cplusplus
 namespace simgrid {
 
 #ifdef __cplusplus
 namespace simgrid {

diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h
index 6eca9b1..c04265f 100644 (file)
--- a/include/simgrid/simix.h
+++ b/include/simgrid/simix.h
@@ -50,7 +50,7 @@ typedef enum {
 extern unsigned smx_context_stack_size;
 extern unsigned smx_context_guard_size;
 
 extern unsigned smx_context_stack_size;
 extern unsigned smx_context_guard_size;
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 XBT_PUBLIC smx_actor_t SIMIX_process_from_PID(aid_t PID);
 
 
 XBT_PUBLIC smx_actor_t SIMIX_process_from_PID(aid_t PID);
 


@@ -87,16 +87,16 @@ XBT_ATTRIB_DEPRECATED_v329("Please use simgrid::simix::Timer::get_date()") XBT_P
     double SIMIX_timer_get_date(smx_timer_t timer);
 
 XBT_PUBLIC void SIMIX_display_process_status();
     double SIMIX_timer_get_date(smx_timer_t timer);
 
 XBT_PUBLIC void SIMIX_display_process_status();

-SG_END_DECL()
+SG_END_DECL

 
 /******************************** Deployment **********************************/
 
 /******************************** Deployment **********************************/

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 XBT_PUBLIC void SIMIX_function_register_default(xbt_main_func_t code);
 
 XBT_PUBLIC void SIMIX_init_application();
 XBT_PUBLIC void SIMIX_process_set_function(const char* process_host, const char* process_function,
                                            xbt_dynar_t arguments, double process_start_time, double process_kill_time);
 XBT_PUBLIC void SIMIX_function_register_default(xbt_main_func_t code);
 
 XBT_PUBLIC void SIMIX_init_application();
 XBT_PUBLIC void SIMIX_process_set_function(const char* process_host, const char* process_function,
                                            xbt_dynar_t arguments, double process_start_time, double process_kill_time);

-SG_END_DECL()
+SG_END_DECL

 
 #ifdef __cplusplus
 XBT_PUBLIC void SIMIX_function_register(const std::string& name, void (*code)(std::vector<std::string>));
 
 #ifdef __cplusplus
 XBT_PUBLIC void SIMIX_function_register(const std::string& name, void (*code)(std::vector<std::string>));


@@ -105,13 +105,13 @@ XBT_PUBLIC void SIMIX_launch_application(const std::string& file);
 #endif
 
 /********************************* Process ************************************/
 #endif
 
 /********************************* Process ************************************/

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 XBT_PUBLIC int SIMIX_process_count();
 XBT_PUBLIC smx_actor_t SIMIX_process_self();
 XBT_PUBLIC const char* SIMIX_process_self_get_name();
 XBT_PUBLIC void SIMIX_process_self_set_data(void* data);
 XBT_PUBLIC void* SIMIX_process_self_get_data();
 XBT_PUBLIC int SIMIX_process_count();
 XBT_PUBLIC smx_actor_t SIMIX_process_self();
 XBT_PUBLIC const char* SIMIX_process_self_get_name();
 XBT_PUBLIC void SIMIX_process_self_set_data(void* data);
 XBT_PUBLIC void* SIMIX_process_self_get_data();

-SG_END_DECL()
+SG_END_DECL

 
 #ifdef __cplusplus
 XBT_PUBLIC void SIMIX_process_on_exit(smx_actor_t process, const std::function<void(bool /*failed*/)>& fun);
 
 #ifdef __cplusplus
 XBT_PUBLIC void SIMIX_process_on_exit(smx_actor_t process, const std::function<void(bool /*failed*/)>& fun);


@@ -143,7 +143,7 @@ XBT_PUBLIC bool simcall_execution_test(const smx_activity_t& execution);
 #endif
 
 /**************************** Process simcalls ********************************/
 #endif
 
 /**************************** Process simcalls ********************************/

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 void simcall_process_set_data(smx_actor_t process, void* data);
 XBT_ATTRIB_DEPRECATED_v328("Please use Actor::suspend()") XBT_PUBLIC void simcall_process_suspend(smx_actor_t process);
 
 void simcall_process_set_data(smx_actor_t process, void* data);
 XBT_ATTRIB_DEPRECATED_v328("Please use Actor::suspend()") XBT_PUBLIC void simcall_process_suspend(smx_actor_t process);
 


@@ -152,7 +152,7 @@ XBT_ATTRIB_DEPRECATED_v328("Please use Actor::join()") XBT_PUBLIC
 
 /* Sleep control */
 XBT_PUBLIC e_smx_state_t simcall_process_sleep(double duration);
 
 /* Sleep control */
 XBT_PUBLIC e_smx_state_t simcall_process_sleep(double duration);

-SG_END_DECL()
+SG_END_DECL

 
 /************************** Communication simcalls ****************************/
 
 
 /************************** Communication simcalls ****************************/
 


@@ -196,7 +196,7 @@ XBT_PUBLIC int simcall_comm_testany(simgrid::kernel::activity::CommImpl* comms[]
 #endif
 
 /************************** Synchro simcalls **********************************/
 #endif
 
 /************************** Synchro simcalls **********************************/

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 XBT_PUBLIC smx_mutex_t simcall_mutex_init();
 XBT_PUBLIC void simcall_mutex_lock(smx_mutex_t mutex);
 XBT_PUBLIC int simcall_mutex_trylock(smx_mutex_t mutex);
 XBT_PUBLIC smx_mutex_t simcall_mutex_init();
 XBT_PUBLIC void simcall_mutex_lock(smx_mutex_t mutex);
 XBT_PUBLIC int simcall_mutex_trylock(smx_mutex_t mutex);


@@ -208,15 +208,15 @@ XBT_PUBLIC int simcall_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, dou
 
 XBT_PUBLIC void simcall_sem_acquire(smx_sem_t sem);
 XBT_PUBLIC int simcall_sem_acquire_timeout(smx_sem_t sem, double max_duration);
 
 XBT_PUBLIC void simcall_sem_acquire(smx_sem_t sem);
 XBT_PUBLIC int simcall_sem_acquire_timeout(smx_sem_t sem, double max_duration);

-SG_END_DECL()
+SG_END_DECL

 
 /*****************************   Io   **************************************/
 #ifdef __cplusplus
 XBT_PUBLIC e_smx_state_t simcall_io_wait(const smx_activity_t& io);
 #endif
 /************************** MC simcalls   **********************************/
 
 /*****************************   Io   **************************************/
 #ifdef __cplusplus
 XBT_PUBLIC e_smx_state_t simcall_io_wait(const smx_activity_t& io);
 #endif
 /************************** MC simcalls   **********************************/

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 XBT_PUBLIC int simcall_mc_random(int min, int max);
 XBT_PUBLIC int simcall_mc_random(int min, int max);

-SG_END_DECL()
+SG_END_DECL

 
 #endif
 
 #endif

diff --git a/include/simgrid/storage.h b/include/simgrid/storage.h
index f82d864..8336287 100644 (file)
--- a/include/simgrid/storage.h
+++ b/include/simgrid/storage.h
@@ -12,7 +12,7 @@
 #include <xbt/base.h>
 
 /* C interface */
 #include <xbt/base.h>
 
 /* C interface */

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 XBT_PUBLIC const char* sg_storage_get_name(sg_storage_t storage);
 XBT_PUBLIC sg_storage_t sg_storage_get_by_name(const char* name);
 
 XBT_PUBLIC const char* sg_storage_get_name(sg_storage_t storage);
 XBT_PUBLIC sg_storage_t sg_storage_get_by_name(const char* name);


@@ -26,6 +26,6 @@ XBT_PUBLIC const char* sg_storage_get_host(sg_storage_t storage);
 XBT_PUBLIC sg_size_t sg_storage_read(sg_storage_t storage, sg_size_t size);
 XBT_PUBLIC sg_size_t sg_storage_write(sg_storage_t storage, sg_size_t size);
 
 XBT_PUBLIC sg_size_t sg_storage_read(sg_storage_t storage, sg_size_t size);
 XBT_PUBLIC sg_size_t sg_storage_write(sg_storage_t storage, sg_size_t size);
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif /* INCLUDE_SIMGRID_STORAGE_H_ */
 
 #endif /* INCLUDE_SIMGRID_STORAGE_H_ */

diff --git a/include/simgrid/vm.h b/include/simgrid/vm.h
index b123867..83f180a 100644 (file)
--- a/include/simgrid/vm.h
+++ b/include/simgrid/vm.h
@@ -12,7 +12,7 @@
 #include <xbt/base.h>
 
 /* C interface */
 #include <xbt/base.h>
 
 /* C interface */

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 /** @brief Opaque type describing a Virtual Machine.
  *  @ingroup msg_VMs
 
 /** @brief Opaque type describing a Virtual Machine.
  *  @ingroup msg_VMs


@@ -41,6 +41,6 @@ XBT_PUBLIC void sg_vm_resume(sg_vm_t vm);
 XBT_PUBLIC void sg_vm_shutdown(sg_vm_t vm);
 XBT_PUBLIC void sg_vm_destroy(sg_vm_t vm);
 
 XBT_PUBLIC void sg_vm_shutdown(sg_vm_t vm);
 XBT_PUBLIC void sg_vm_destroy(sg_vm_t vm);
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif /* INCLUDE_SIMGRID_VM_H_ */
 
 #endif /* INCLUDE_SIMGRID_VM_H_ */

diff --git a/include/simgrid/zone.h b/include/simgrid/zone.h
index e2772bc..909f9f9 100644 (file)
--- a/include/simgrid/zone.h
+++ b/include/simgrid/zone.h
@@ -13,7 +13,7 @@
 #include <xbt/dict.h>
 
 /* C interface */
 #include <xbt/dict.h>
 
 /* C interface */

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 XBT_PUBLIC sg_netzone_t sg_zone_get_root();
 XBT_PUBLIC const char* sg_zone_get_name(sg_netzone_t zone);
 
 XBT_PUBLIC sg_netzone_t sg_zone_get_root();
 XBT_PUBLIC const char* sg_zone_get_name(sg_netzone_t zone);


@@ -23,6 +23,6 @@ XBT_PUBLIC const char* sg_zone_get_property_value(sg_netzone_t as, const char* n
 XBT_PUBLIC void sg_zone_set_property_value(sg_netzone_t netzone, const char* name, char* value);
 XBT_PUBLIC void sg_zone_get_hosts(sg_netzone_t zone, xbt_dynar_t whereto);
 
 XBT_PUBLIC void sg_zone_set_property_value(sg_netzone_t netzone, const char* name, char* value);
 XBT_PUBLIC void sg_zone_get_hosts(sg_netzone_t zone, xbt_dynar_t whereto);
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif /* INCLUDE_SIMGRID_ZONE_H_ */
 
 #endif /* INCLUDE_SIMGRID_ZONE_H_ */

diff --git a/include/smpi/sampi.h b/include/smpi/sampi.h
index e7c7d7c..b51f8ee 100644 (file)
--- a/include/smpi/sampi.h
+++ b/include/smpi/sampi.h
@@ -21,7 +21,7 @@
 #define free(ptr) _sampi_free(ptr)
 #endif
 
 #define free(ptr) _sampi_free(ptr)
 #endif
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 XBT_PUBLIC void* _sampi_malloc(size_t size);
 XBT_PUBLIC void* _sampi_calloc(size_t n_elm, size_t elm_size);
 
 XBT_PUBLIC void* _sampi_malloc(size_t size);
 XBT_PUBLIC void* _sampi_calloc(size_t n_elm, size_t elm_size);


@@ -32,6 +32,6 @@ AMPI_CALL(XBT_PUBLIC int, MPI_Iteration_in, (MPI_Comm comm))
 AMPI_CALL(XBT_PUBLIC int, MPI_Iteration_out, (MPI_Comm comm))
 AMPI_CALL(XBT_PUBLIC void, MPI_Migrate, (MPI_Comm comm))
 
 AMPI_CALL(XBT_PUBLIC int, MPI_Iteration_out, (MPI_Comm comm))
 AMPI_CALL(XBT_PUBLIC void, MPI_Migrate, (MPI_Comm comm))
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif
 
 #endif

diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h
index 5af6d62..2dc0d0b 100644 (file)
--- a/include/smpi/smpi.h
+++ b/include/smpi/smpi.h
@@ -29,7 +29,7 @@
   type _XBT_CONCAT(P, name) args
 #endif
 
   type _XBT_CONCAT(P, name) args
 #endif
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 #define MPI_THREAD_SINGLE     0
 #define MPI_THREAD_FUNNELED   1
 #define MPI_THREAD_SERIALIZED 2
 #define MPI_THREAD_SINGLE     0
 #define MPI_THREAD_FUNNELED   1
 #define MPI_THREAD_SERIALIZED 2


@@ -1057,7 +1057,7 @@ XBT_PUBLIC void SMPI_app_instance_register(const char* name, xbt_main_func_t cod
 XBT_PUBLIC void SMPI_init();
 XBT_PUBLIC void SMPI_finalize();
 
 XBT_PUBLIC void SMPI_init();
 XBT_PUBLIC void SMPI_finalize();
 

-SG_END_DECL()
+SG_END_DECL

 
 /* C++ declarations for shared_malloc */
 #ifdef __cplusplus
 
 /* C++ declarations for shared_malloc */
 #ifdef __cplusplus

diff --git a/include/xbt/asserts.h b/include/xbt/asserts.h
index 585b123..29f5625 100644 (file)
--- a/include/xbt/asserts.h
+++ b/include/xbt/asserts.h
@@ -12,7 +12,7 @@
 #include <xbt/log.h>
 #include <xbt/misc.h>
 
 #include <xbt/log.h>
 #include <xbt/misc.h>
 

-SG_BEGIN_DECL()
+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 void xbt_backtrace_display_current();
 XBT_PUBLIC_DATA int xbt_log_no_loc; /* Do not show the backtrace on failed backtrace when doing our tests */
 
 XBT_PUBLIC void xbt_backtrace_display_current();


@@ -48,5 +48,5 @@ XBT_PUBLIC void xbt_backtrace_display_current();
 #endif
 
 /** @} */
 #endif
 
 /** @} */

-SG_END_DECL()
+SG_END_DECL

 #endif                          /* XBT_ASSERTS_H */
 #endif                          /* XBT_ASSERTS_H */

diff --git a/include/xbt/automaton.h b/include/xbt/automaton.h
index 8a78ff0..03339f7 100644 (file)
--- a/include/xbt/automaton.h
+++ b/include/xbt/automaton.h
@@ -8,7 +8,7 @@
 
 #include <xbt/dynar.h>
 
 
 #include <xbt/dynar.h>
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 typedef struct xbt_automaton_state {
   char* id;
 
 typedef struct xbt_automaton_state {
   char* id;


@@ -114,6 +114,6 @@ XBT_PUBLIC void xbt_automaton_exp_label_free_voidp(void* e);
 XBT_PUBLIC void xbt_automaton_propositional_symbol_free_voidp(void* ps);
 XBT_PUBLIC void xbt_automaton_free(xbt_automaton_t a);
 
 XBT_PUBLIC void xbt_automaton_propositional_symbol_free_voidp(void* ps);
 XBT_PUBLIC void xbt_automaton_free(xbt_automaton_t a);
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif
 
 #endif

diff --git a/include/xbt/backtrace.hpp b/include/xbt/backtrace.hpp
index 27b9f8e..ad83cea 100644 (file)
--- a/include/xbt/backtrace.hpp
+++ b/include/xbt/backtrace.hpp
@@ -14,10 +14,10 @@
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 /** @brief Shows a backtrace of the current location */
 XBT_PUBLIC void xbt_backtrace_display_current();
 /** @brief Shows a backtrace of the current location */
 XBT_PUBLIC void xbt_backtrace_display_current();

-SG_END_DECL()
+SG_END_DECL

 
 namespace simgrid {
 namespace xbt {
 
 namespace simgrid {
 namespace xbt {

diff --git a/include/xbt/base.h b/include/xbt/base.h
index 04ab9f3..5dbeb50 100644 (file)
--- a/include/xbt/base.h
+++ b/include/xbt/base.h
@@ -186,17 +186,17 @@
 /* C++ users need love */
 #ifndef SG_BEGIN_DECL
 # ifdef __cplusplus
 /* C++ users need love */
 #ifndef SG_BEGIN_DECL
 # ifdef __cplusplus

-#  define SG_BEGIN_DECL() extern "C" {
+#  define SG_BEGIN_DECL extern "C" {

 # else
 # else

-#  define SG_BEGIN_DECL()
+#  define SG_BEGIN_DECL

 # endif
 #endif
 
 #ifndef SG_END_DECL
 # ifdef __cplusplus
 # endif
 #endif
 
 #ifndef SG_END_DECL
 # ifdef __cplusplus

-#  define SG_END_DECL() }
+#  define SG_END_DECL }

 # else
 # else

-#  define SG_END_DECL()
+#  define SG_END_DECL

 # endif
 #endif
 /* End of cruft for C++ */
 # endif
 #endif
 /* End of cruft for C++ */

diff --git a/include/xbt/config.h b/include/xbt/config.h
index c1b7fbc..517909c 100644 (file)
--- a/include/xbt/config.h
+++ b/include/xbt/config.h
@@ -61,7 +61,7 @@ typedef simgrid::config::Config* xbt_cfg_t;
 typedef void* xbt_cfg_t;
 #endif
 
 typedef void* xbt_cfg_t;
 #endif
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 /* Set the value of the cell @a name in @a cfg with the provided value.*/
 XBT_PUBLIC void sg_cfg_set_int(const char* name, int val);
 
 /* Set the value of the cell @a name in @a cfg with the provided value.*/
 XBT_PUBLIC void sg_cfg_set_int(const char* name, int val);


@@ -99,5 +99,5 @@ XBT_PUBLIC double sg_cfg_get_double(const char* name);
 XBT_PUBLIC int sg_cfg_get_boolean(const char* name);
 /** @} */
 
 XBT_PUBLIC int sg_cfg_get_boolean(const char* name);
 /** @} */
 

-SG_END_DECL()
+SG_END_DECL

 #endif /* XBT_CONFIG_H */
 #endif /* XBT_CONFIG_H */

diff --git a/include/xbt/dict.h b/include/xbt/dict.h
index f27f5d3..89e18d7 100644 (file)
--- a/include/xbt/dict.h
+++ b/include/xbt/dict.h
@@ -13,7 +13,7 @@
 
 #include <stdint.h>             /* uintptr_t */
 
 
 #include <stdint.h>             /* uintptr_t */
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 /** @addtogroup XBT_dict
  *  @brief The dictionary data structure (comparable to hash tables)
 
 /** @addtogroup XBT_dict
  *  @brief The dictionary data structure (comparable to hash tables)


@@ -164,6 +164,6 @@ xbt_dict_foreach(head, cursor, key, data) {
 
 /** @} */
 
 
 /** @} */
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif /* XBT_DICT_H */
 
 #endif /* XBT_DICT_H */

diff --git a/include/xbt/dynar.h b/include/xbt/dynar.h
index 7891732..46fa9c8 100644 (file)
--- a/include/xbt/dynar.h
+++ b/include/xbt/dynar.h
@@ -13,7 +13,7 @@
 #include <xbt/base.h> /* SG_BEGIN_DECL */
 #include <xbt/function_types.h>
 
 #include <xbt/base.h> /* SG_BEGIN_DECL */
 #include <xbt/function_types.h>
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 /** @addtogroup XBT_dynar
  * @brief DynArr are dynamically sized vector which may contain any type of variables.
 
 /** @addtogroup XBT_dynar
  * @brief DynArr are dynamically sized vector which may contain any type of variables.


@@ -248,6 +248,6 @@ xbt_dynar_foreach (dyn,cpt,str) {
        (_cursor)++)
 #endif
 /** @} */
        (_cursor)++)
 #endif
 /** @} */

-SG_END_DECL()
+SG_END_DECL

 
 #endif /* XBT_DYNAR_H */
 
 #endif /* XBT_DYNAR_H */

diff --git a/include/xbt/ex.h b/include/xbt/ex.h
index f598781..bb9ff8f 100644 (file)
--- a/include/xbt/ex.h
+++ b/include/xbt/ex.h
@@ -21,7 +21,7 @@
  *  exactly play nicely together.
  */
 
  *  exactly play nicely together.
  */
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 /** Helper function used to throw exceptions in C */
 XBT_ATTRIB_NORETURN XBT_PUBLIC void _xbt_throw(char* message, int value, const char* file, int line, const char* func);
 
 /** Helper function used to throw exceptions in C */
 XBT_ATTRIB_NORETURN XBT_PUBLIC void _xbt_throw(char* message, int value, const char* file, int line, const char* func);


@@ -55,7 +55,7 @@ XBT_ATTRIB_NORETURN XBT_PUBLIC void xbt_throw_unimplemented(const char* file, in
  */
 #define DIE_IMPOSSIBLE xbt_die("The Impossible Did Happen (yet again)")
 
  */
 #define DIE_IMPOSSIBLE xbt_die("The Impossible Did Happen (yet again)")
 

-SG_END_DECL()
+SG_END_DECL

 
 /** @} */
 #endif                          /* __XBT_EX_H__ */
 
 /** @} */
 #endif                          /* __XBT_EX_H__ */

diff --git a/include/xbt/function_types.h b/include/xbt/function_types.h
index 84b8b3a..3bbef68 100644 (file)
--- a/include/xbt/function_types.h
+++ b/include/xbt/function_types.h
@@ -10,7 +10,7 @@
 
 #include <xbt/base.h>
 
 
 #include <xbt/base.h>
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 typedef void (*void_f_pvoid_t) (void *);
 typedef void *(*pvoid_f_void_t) (void);
 
 typedef void (*void_f_pvoid_t) (void *);
 typedef void *(*pvoid_f_void_t) (void);


@@ -23,5 +23,5 @@ typedef int (*int_f_cpvoid_cpvoid_t) (const void *, const void *);
 
 typedef int (*xbt_main_func_t) (int argc, char *argv[]);
 
 
 typedef int (*xbt_main_func_t) (int argc, char *argv[]);
 

-SG_END_DECL()
+SG_END_DECL

 #endif                          /* XBT_FUNCTION_TYPE_H */
 #endif                          /* XBT_FUNCTION_TYPE_H */

diff --git a/include/xbt/graph.h b/include/xbt/graph.h
index 98e7661..b60194f 100644 (file)
--- a/include/xbt/graph.h
+++ b/include/xbt/graph.h
@@ -9,13 +9,13 @@
 #include <xbt/dynar.h>
 #include <xbt/misc.h> /* SG_BEGIN_DECL */
 
 #include <xbt/dynar.h>
 #include <xbt/misc.h> /* SG_BEGIN_DECL */
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 

-  /** @addtogroup XBT_graph
-   *  @brief A graph data type with several interesting algorithms
-   *
-   * @{
-   */
+/** @addtogroup XBT_graph
+ *  @brief A graph data type with several interesting algorithms
+ *
+ * @{
+ */

 
 typedef struct xbt_node *xbt_node_t;
 typedef struct xbt_edge *xbt_edge_t;
 
 typedef struct xbt_node *xbt_node_t;
 typedef struct xbt_edge *xbt_edge_t;


@@ -68,6 +68,6 @@ XBT_PUBLIC xbt_dynar_t xbt_graph_node_get_outedges(xbt_node_t n);
 XBT_PUBLIC xbt_node_t xbt_graph_edge_get_source(xbt_edge_t e);
 XBT_PUBLIC xbt_node_t xbt_graph_edge_get_target(xbt_edge_t e);
 
 XBT_PUBLIC xbt_node_t xbt_graph_edge_get_source(xbt_edge_t e);
 XBT_PUBLIC xbt_node_t xbt_graph_edge_get_target(xbt_edge_t e);
 

-SG_END_DECL()
+SG_END_DECL

 #endif /* XBT_GRAPH_H */
 /** @} */
 #endif /* XBT_GRAPH_H */
 /** @} */

diff --git a/include/xbt/log.h b/include/xbt/log.h
index 6261dfc..c5415c1 100644 (file)
--- a/include/xbt/log.h
+++ b/include/xbt/log.h
@@ -33,7 +33,7 @@
 #include <stddef.h> /* NULL */
 #include <stdio.h>  /* FILE */
 #include <xbt/misc.h>
 #include <stddef.h> /* NULL */
 #include <stdio.h>  /* FILE */
 #include <xbt/misc.h>

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 /**@brief Log priorities
  * @ingroup XBT_log
  *
 /**@brief Log priorities
  * @ingroup XBT_log
  *


@@ -102,7 +102,7 @@ typedef enum {
  * Implementation of XBT_LOG_NEW_SUBCATEGORY, which must declare "extern parent" in addition to avoid an extra
  * declaration of root when XBT_LOG_NEW_SUBCATEGORY is called by XBT_LOG_NEW_CATEGORY */
 #define XBT_LOG_NEW_SUBCATEGORY_helper(catName, parent, desc)                                                          \
  * Implementation of XBT_LOG_NEW_SUBCATEGORY, which must declare "extern parent" in addition to avoid an extra
  * declaration of root when XBT_LOG_NEW_SUBCATEGORY is called by XBT_LOG_NEW_CATEGORY */
 #define XBT_LOG_NEW_SUBCATEGORY_helper(catName, parent, desc)                                                          \

-  SG_BEGIN_DECL()                                                                                                      \
+  SG_BEGIN_DECL                                                                                                        \

   extern void _XBT_LOGV_CTOR(catName)(void) XBT_ATTRIB_CONSTRUCTOR(600);                                               \
   void _XBT_LOGV_CTOR(catName)(void)                                                                                   \
   {                                                                                                                    \
   extern void _XBT_LOGV_CTOR(catName)(void) XBT_ATTRIB_CONSTRUCTOR(600);                                               \
   void _XBT_LOGV_CTOR(catName)(void)                                                                                   \
   {                                                                                                                    \


@@ -111,7 +111,7 @@ typedef enum {
       _xbt_log_cat_init(&_XBT_LOGV(catName), xbt_log_priority_uninitialized);                                          \
     }                                                                                                                  \
   }                                                                                                                    \
       _xbt_log_cat_init(&_XBT_LOGV(catName), xbt_log_priority_uninitialized);                                          \
     }                                                                                                                  \
   }                                                                                                                    \

-  SG_END_DECL()                                                                                                        \
+  SG_END_DECL                                                                                                          \

   XBT_EXPORT_NO_IMPORT s_xbt_log_category_t _XBT_LOGV(catName) = {                                                     \
       &_XBT_LOGV(parent),                                                                                              \
       NULL /* firstChild */,                                                                                           \
   XBT_EXPORT_NO_IMPORT s_xbt_log_category_t _XBT_LOGV(catName) = {                                                     \
       &_XBT_LOGV(parent),                                                                                              \
       NULL /* firstChild */,                                                                                           \


@@ -492,5 +492,5 @@ extern xbt_log_layout_t xbt_log_default_layout;
  */
 #define XBT_HELP(...) XBT_CINFO(xbt_help, __VA_ARGS__)
 
  */
 #define XBT_HELP(...) XBT_CINFO(xbt_help, __VA_ARGS__)
 

-SG_END_DECL()
+SG_END_DECL

 #endif                          /* ! _XBT_LOG_H_ */
 #endif                          /* ! _XBT_LOG_H_ */

diff --git a/include/xbt/mallocator.h b/include/xbt/mallocator.h
index 135eb92..4575ee8 100644 (file)
--- a/include/xbt/mallocator.h
+++ b/include/xbt/mallocator.h
@@ -11,7 +11,7 @@
 #include <xbt/function_types.h>
 #include <xbt/misc.h>
 
 #include <xbt/function_types.h>
 #include <xbt/misc.h>
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 /** @addtogroup XBT_mallocator
  *  @brief The mallocator system
 
 /** @addtogroup XBT_mallocator
  *  @brief The mallocator system


@@ -50,5 +50,5 @@ XBT_PUBLIC void xbt_mallocator_release(xbt_mallocator_t mallocator, void* object
 XBT_PUBLIC void xbt_mallocator_initialization_is_done(int protect);
 /** @} */
 
 XBT_PUBLIC void xbt_mallocator_initialization_is_done(int protect);
 /** @} */
 

-SG_END_DECL()
+SG_END_DECL

 #endif                          /* _XBT_MALLOCATOR_H */
 #endif                          /* _XBT_MALLOCATOR_H */

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index 878a7ee..2af7be8 100644 (file)
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -12,7 +12,7 @@
 
 #include <stdarg.h>
 
 
 #include <stdarg.h>
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 /** Cache the size of a memory page for the current system. */
 XBT_PUBLIC_DATA int xbt_pagesize;
 
 /** Cache the size of a memory page for the current system. */
 XBT_PUBLIC_DATA int xbt_pagesize;


@@ -39,6 +39,6 @@ XBT_PUBLIC char* bvprintf(const char* fmt, va_list ap);
 XBT_PUBLIC char* bprintf(const char* fmt, ...) XBT_ATTRIB_PRINTF(1, 2);
 /** @} */
 
 XBT_PUBLIC char* bprintf(const char* fmt, ...) XBT_ATTRIB_PRINTF(1, 2);
 /** @} */
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif                          /* XBT_MISC_H */
 
 #endif                          /* XBT_MISC_H */

diff --git a/include/xbt/module.h b/include/xbt/module.h
index b104c88..1ad8aa6 100644 (file)
--- a/include/xbt/module.h
+++ b/include/xbt/module.h
@@ -10,10 +10,10 @@
 
 #include <xbt/misc.h>           /* XBT_PUBLIC */
 
 
 #include <xbt/misc.h>           /* XBT_PUBLIC */
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 XBT_PUBLIC void xbt_init(int* argc, char** argv);
 
 
 XBT_PUBLIC void xbt_init(int* argc, char** argv);
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif /* XBT_MODULE_H */
 
 #endif /* XBT_MODULE_H */

diff --git a/include/xbt/str.h b/include/xbt/str.h
index b98b00e..352d544 100644 (file)
--- a/include/xbt/str.h
+++ b/include/xbt/str.h
@@ -14,7 +14,7 @@
 
 #include <stdarg.h> /* va_* */
 
 
 #include <stdarg.h> /* va_* */
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 /** @addtogroup XBT_str
  *  @brief String manipulation functions
 
 /** @addtogroup XBT_str
  *  @brief String manipulation functions


@@ -111,5 +111,5 @@ static inline unsigned int xbt_str_hash(const char *str)
 }
 
 /**@}*/
 }
 
 /**@}*/

-SG_END_DECL()
+SG_END_DECL

 #endif                          /* XBT_STR_H */
 #endif                          /* XBT_STR_H */

diff --git a/include/xbt/synchro.h b/include/xbt/synchro.h
index 5648131..d11e3e3 100644 (file)
--- a/include/xbt/synchro.h
+++ b/include/xbt/synchro.h
@@ -12,7 +12,7 @@
 #include <xbt/function_types.h>
 #include <xbt/misc.h> /* SG_BEGIN_DECL */
 
 #include <xbt/function_types.h>
 #include <xbt/misc.h> /* SG_BEGIN_DECL */
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 /** @addtogroup XBT_synchro
  *  @brief XBT synchronization tools
 
 /** @addtogroup XBT_synchro
  *  @brief XBT synchronization tools


@@ -80,5 +80,5 @@ XBT_ATTRIB_DEPRECATED_v328("Please use sg_cond_destroy") XBT_PUBLIC void xbt_con
 
 /** @} */
 
 
 /** @} */
 

-SG_END_DECL()
+SG_END_DECL

 #endif /* _XBT_THREAD_H */
 #endif /* _XBT_THREAD_H */

diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index f24b717..4f11f0e 100644 (file)
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <stdarg.h>             /* va_list */
 
 #include <stdlib.h>
 #include <stdarg.h>             /* va_list */
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 /* They live in asserts.h, but need to be declared before this module.
    double declaration to cut dependency cycle */
 
 /* They live in asserts.h, but need to be declared before this module.
    double declaration to cut dependency cycle */


@@ -123,7 +123,7 @@ XBT_PUBLIC void xbt_free_f(void* p) XBT_FREE_NOEXCEPT;
 /** @brief should be given a pointer to pointer, and frees the second one */
 XBT_PUBLIC void xbt_free_ref(void* d) XBT_FREE_NOEXCEPT;
 
 /** @brief should be given a pointer to pointer, and frees the second one */
 XBT_PUBLIC void xbt_free_ref(void* d) XBT_FREE_NOEXCEPT;
 

-SG_END_DECL()
+SG_END_DECL

 
 #define xbt_new(type, count)  ((type*)xbt_malloc (sizeof (type) * (count)))
 /** @brief like calloc, but xbt_die() on error
 
 #define xbt_new(type, count)  ((type*)xbt_malloc (sizeof (type) * (count)))
 /** @brief like calloc, but xbt_die() on error

diff --git a/include/xbt/virtu.h b/include/xbt/virtu.h
index 3bd0a75..98cd941 100644 (file)
--- a/include/xbt/virtu.h
+++ b/include/xbt/virtu.h
@@ -13,7 +13,7 @@
 #include <xbt/function_types.h>
 #include <xbt/misc.h>
 
 #include <xbt/function_types.h>
 #include <xbt/misc.h>
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 XBT_PUBLIC const char* xbt_procname(void);
 
 
 XBT_PUBLIC const char* xbt_procname(void);
 


@@ -25,5 +25,5 @@ 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;
 
 /** Contains all the parameters we got from the command line (including argv[0]) */
 XBT_PUBLIC_DATA xbt_dynar_t xbt_cmdline;
 

-SG_END_DECL()
+SG_END_DECL

 #endif /* XBT_VIRTU_H */
 #endif /* XBT_VIRTU_H */

diff --git a/include/xbt/xbt_os_time.h b/include/xbt/xbt_os_time.h
index 730a364..77b27e1 100644 (file)
--- a/include/xbt/xbt_os_time.h
+++ b/include/xbt/xbt_os_time.h
@@ -11,7 +11,7 @@
 #include <xbt/misc.h>           /* XBT_PUBLIC */
 #include <stddef.h>             /* size_t */
 
 #include <xbt/misc.h>           /* XBT_PUBLIC */
 #include <stddef.h>             /* size_t */
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 /** @brief get time in seconds
  *
 
 /** @brief get time in seconds
  *


@@ -39,6 +39,6 @@ XBT_PUBLIC void xbt_os_threadtimer_start(xbt_os_timer_t timer);
 XBT_PUBLIC void xbt_os_threadtimer_resume(xbt_os_timer_t timer);
 XBT_PUBLIC void xbt_os_threadtimer_stop(xbt_os_timer_t timer);
 
 XBT_PUBLIC void xbt_os_threadtimer_resume(xbt_os_timer_t timer);
 XBT_PUBLIC void xbt_os_threadtimer_stop(xbt_os_timer_t timer);
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif
 
 #endif

diff --git a/src/bindings/java/jmsg_comm.h b/src/bindings/java/jmsg_comm.h
index 6150c2c..e38f067 100644 (file)
--- a/src/bindings/java/jmsg_comm.h
+++ b/src/bindings/java/jmsg_comm.h
@@ -11,7 +11,7 @@
 #include "simgrid/msg.h"
 #include <jni.h>
 
 #include "simgrid/msg.h"
 #include <jni.h>
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 /* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */
 #ifndef JNIEXPORT
 
 /* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */
 #ifndef JNIEXPORT


@@ -35,5 +35,5 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Comm_waitCompletion(JNIEnv *env, job
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Comm_waitAll(JNIEnv *env, jclass cls, jobjectArray jcomms, jdouble timeout);
 JNIEXPORT int JNICALL Java_org_simgrid_msg_Comm_waitAny(JNIEnv *env, jclass cls, jobjectArray jcomms);
 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Comm_waitAll(JNIEnv *env, jclass cls, jobjectArray jcomms, jdouble timeout);
 JNIEXPORT int JNICALL Java_org_simgrid_msg_Comm_waitAny(JNIEnv *env, jclass cls, jobjectArray jcomms);
 

-SG_END_DECL()
+SG_END_DECL

 #endif
 #endif

diff --git a/src/bindings/java/jmsg_file.h b/src/bindings/java/jmsg_file.h
index 1da1742..6c145fb 100644 (file)
--- a/src/bindings/java/jmsg_file.h
+++ b/src/bindings/java/jmsg_file.h
@@ -12,7 +12,7 @@
 #include "simgrid/plugins/file_system.h"
 #include <jni.h>
 
 #include "simgrid/plugins/file_system.h"
 #include <jni.h>
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 /* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */
 #ifndef JNIEXPORT
 
 /* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */
 #ifndef JNIEXPORT


@@ -35,5 +35,5 @@ JNIEXPORT jlong JNICALL Java_org_simgrid_msg_File_write(JNIEnv *env, jobject jfi
 JNIEXPORT void JNICALL Java_org_simgrid_msg_File_seek(JNIEnv *env, jobject jfile, jlong joffset, jlong jorigin);
 JNIEXPORT void JNICALL Java_org_simgrid_msg_File_close(JNIEnv *env, jobject jfile);
 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_File_seek(JNIEnv *env, jobject jfile, jlong joffset, jlong jorigin);
 JNIEXPORT void JNICALL Java_org_simgrid_msg_File_close(JNIEnv *env, jobject jfile);
 

-SG_END_DECL()
+SG_END_DECL

 #endif
 #endif

diff --git a/src/bindings/java/jmsg_host.h b/src/bindings/java/jmsg_host.h
index 9097244..08a48d5 100644 (file)
--- a/src/bindings/java/jmsg_host.h
+++ b/src/bindings/java/jmsg_host.h
@@ -12,7 +12,7 @@
 #include "simgrid/plugins/file_system.h"
 #include <jni.h>
 
 #include "simgrid/plugins/file_system.h"
 #include <jni.h>
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 /* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */
 #ifndef JNIEXPORT
 
 /* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */
 #ifndef JNIEXPORT


@@ -73,5 +73,5 @@ JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getLoad(JNIEnv* env, jobject
 JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getCurrentLoad(JNIEnv *env, jobject jhost);
 JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getAvgLoad(JNIEnv *env, jobject jhost);
 JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getComputedFlops (JNIEnv *env, jobject jhost);
 JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getCurrentLoad(JNIEnv *env, jobject jhost);
 JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getAvgLoad(JNIEnv *env, jobject jhost);
 JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getComputedFlops (JNIEnv *env, jobject jhost);

-SG_END_DECL()
+SG_END_DECL

 #endif
 #endif

diff --git a/src/bindings/java/jmsg_process.h b/src/bindings/java/jmsg_process.h
index 620754f..06b38dc 100644 (file)
--- a/src/bindings/java/jmsg_process.h
+++ b/src/bindings/java/jmsg_process.h
@@ -11,7 +11,7 @@
 #include "simgrid/msg.h"
 #include <jni.h>
 
 #include "simgrid/msg.h"
 #include <jni.h>
 

-SG_BEGIN_DECL();
+SG_BEGIN_DECL;

 
 /* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */
 #ifndef JNIEXPORT
 
 /* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */
 #ifndef JNIEXPORT


@@ -66,5 +66,5 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_yield(JNIEnv* env, jclass cl
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_setKillTime(JNIEnv* env, jobject jprocess, jdouble jkilltime);
 JNIEXPORT jint JNICALL Java_org_simgrid_msg_Process_getCount(JNIEnv * env, jclass cls);
 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_setKillTime(JNIEnv* env, jobject jprocess, jdouble jkilltime);
 JNIEXPORT jint JNICALL Java_org_simgrid_msg_Process_getCount(JNIEnv * env, jclass cls);
 

-SG_END_DECL();
+SG_END_DECL;

 #endif
 #endif

diff --git a/src/bindings/java/jmsg_storage.h b/src/bindings/java/jmsg_storage.h
index 4c76b0c..77e2d14 100644 (file)
--- a/src/bindings/java/jmsg_storage.h
+++ b/src/bindings/java/jmsg_storage.h
@@ -11,7 +11,7 @@
 #include "simgrid/msg.h"
 #include <jni.h>
 
 #include "simgrid/msg.h"
 #include <jni.h>
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 /** Returns a new java instance of a storage. */
 jobject jstorage_new_instance(JNIEnv * env);
 
 /** Returns a new java instance of a storage. */
 jobject jstorage_new_instance(JNIEnv * env);


@@ -43,5 +43,5 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Storage_setProperty(JNIEnv* env, job
 JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getHost(JNIEnv * env,jobject jstorage);
 JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Storage_all(JNIEnv *env, jclass cls);
 
 JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getHost(JNIEnv * env,jobject jstorage);
 JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Storage_all(JNIEnv *env, jclass cls);
 

-SG_END_DECL()
+SG_END_DECL

 #endif
 #endif

diff --git a/src/bindings/java/jmsg_synchro.h b/src/bindings/java/jmsg_synchro.h
index a5172a1..26d7c33 100644 (file)
--- a/src/bindings/java/jmsg_synchro.h
+++ b/src/bindings/java/jmsg_synchro.h
@@ -11,7 +11,7 @@
 #include "xbt/base.h"
 #include <jni.h>
 
 #include "xbt/base.h"
 #include <jni.h>
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_nativeInit(JNIEnv *env, jclass cls);
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_init(JNIEnv * env, jobject obj);
 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_nativeInit(JNIEnv *env, jclass cls);
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_init(JNIEnv * env, jobject obj);


@@ -25,5 +25,5 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Semaphore_release(JNIEnv * env, jobj
 JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Semaphore_wouldBlock(JNIEnv * env, jobject obj);
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Semaphore_nativeFinalize(JNIEnv * env, jobject obj);
 
 JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Semaphore_wouldBlock(JNIEnv * env, jobject obj);
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Semaphore_nativeFinalize(JNIEnv * env, jobject obj);
 

-SG_END_DECL()
+SG_END_DECL

 #endif
 #endif

diff --git a/src/bindings/java/jmsg_task.h b/src/bindings/java/jmsg_task.h
index b4f877b..787384f 100644 (file)
--- a/src/bindings/java/jmsg_task.h
+++ b/src/bindings/java/jmsg_task.h
@@ -11,7 +11,7 @@
 #include <jni.h>
 #include "simgrid/msg.h"
 
 #include <jni.h>
 #include "simgrid/msg.h"
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 /** Binds a native instance to a java instance. */
 void jtask_bind(jobject jtask, msg_task_t task, JNIEnv * env);
 
 /** Binds a native instance to a java instance. */
 void jtask_bind(jobject jtask, msg_task_t task, JNIEnv * env);


@@ -60,5 +60,5 @@ JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Task_listen(JNIEnv* env, jclass
 JNIEXPORT jint JNICALL Java_org_simgrid_msg_Task_listenFromHost(JNIEnv* env, jclass cls, jstring jalias, jobject jhost);
 JNIEXPORT jint JNICALL Java_org_simgrid_msg_Task_listenFrom(JNIEnv* env, jclass cls, jstring jalias);
 
 JNIEXPORT jint JNICALL Java_org_simgrid_msg_Task_listenFromHost(JNIEnv* env, jclass cls, jstring jalias, jobject jhost);
 JNIEXPORT jint JNICALL Java_org_simgrid_msg_Task_listenFrom(JNIEnv* env, jclass cls, jstring jalias);
 

-SG_END_DECL()
+SG_END_DECL

 #endif
 #endif

diff --git a/src/bindings/java/jmsg_vm.h b/src/bindings/java/jmsg_vm.h
index 90a3b37..ec16719 100644 (file)
--- a/src/bindings/java/jmsg_vm.h
+++ b/src/bindings/java/jmsg_vm.h
@@ -11,7 +11,7 @@
 #include <jni.h>
 #include "simgrid/msg.h"
 
 #include <jni.h>
 #include "simgrid/msg.h"
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 /* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */
 #ifndef JNIEXPORT
 
 /* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */
 #ifndef JNIEXPORT


@@ -48,6 +48,6 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_resume(JNIEnv* env, jobject jvm);
 JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_shutdown(JNIEnv* env, jobject jvm);
 JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_destroy(JNIEnv* env, jobject jvm);
 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_shutdown(JNIEnv* env, jobject jvm);
 JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_destroy(JNIEnv* env, jobject jvm);
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif
 
 #endif

diff --git a/src/include/mc/datatypes.h b/src/include/mc/datatypes.h
index 9371068..5a7e2da 100644 (file)
--- a/src/include/mc/datatypes.h
+++ b/src/include/mc/datatypes.h
@@ -13,7 +13,7 @@
 #include <ucontext.h>
 #endif
 
 #include <ucontext.h>
 #endif
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 struct s_stack_region{
   void *address;
 
 struct s_stack_region{
   void *address;


@@ -25,6 +25,6 @@ struct s_stack_region{
 };
 typedef struct s_stack_region  s_stack_region_t;
 
 };
 typedef struct s_stack_region  s_stack_region_t;
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif
 
 #endif

diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h
index b502542..c662db5 100644 (file)
--- a/src/include/mc/mc.h
+++ b/src/include/mc/mc.h
@@ -22,7 +22,7 @@
 
 #define STD_HEAP_SIZE   (sizeof(void*)<=4 ? (100*1024*1024) : (1ll*1024*1024*1024*1024))
 
 
 #define STD_HEAP_SIZE   (sizeof(void*)<=4 ? (100*1024*1024) : (1ll*1024*1024*1024*1024))
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 /********************************* Global *************************************/
 XBT_ATTRIB_NORETURN XBT_PUBLIC void MC_run();
 
 /********************************* Global *************************************/
 XBT_ATTRIB_NORETURN XBT_PUBLIC void MC_run();


@@ -33,6 +33,6 @@ XBT_PRIVATE void MC_automaton_load(const char *file);
 /********************************* Memory *************************************/
 XBT_PUBLIC void MC_memory_init(); /* Initialize the memory subsystem */
 
 /********************************* Memory *************************************/
 XBT_PUBLIC void MC_memory_init(); /* Initialize the memory subsystem */
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif
 
 #endif

diff --git a/src/include/xbt/coverage.h b/src/include/xbt/coverage.h
index c301f41..a3b5295 100644 (file)
--- a/src/include/xbt/coverage.h
+++ b/src/include/xbt/coverage.h
@@ -8,7 +8,7 @@
 
 #include <xbt/base.h>
 
 
 #include <xbt/base.h>
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 #ifdef COVERAGE
 extern void __gcov_flush();
 
 #ifdef COVERAGE
 extern void __gcov_flush();


@@ -17,6 +17,6 @@ extern void __gcov_flush();
 #define coverage_checkpoint() (void)0
 #endif
 
 #define coverage_checkpoint() (void)0
 #endif
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif
 
 #endif

diff --git a/src/include/xbt/mmalloc.h b/src/include/xbt/mmalloc.h
index f71e3b4..8e879e3 100644 (file)
--- a/src/include/xbt/mmalloc.h
+++ b/src/include/xbt/mmalloc.h
@@ -17,7 +17,7 @@
 #include "xbt/dict.h"
 #include "xbt/dynar.h"
 
 #include "xbt/dict.h"
 #include "xbt/dynar.h"
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 /* Datatype representing a separate heap. The whole point of the mmalloc module is to allow several such heaps in the
  * process. It thus works by redefining all the classical memory management functions (malloc and friends) with an
 
 /* Datatype representing a separate heap. The whole point of the mmalloc module is to allow several such heaps in the
  * process. It thus works by redefining all the classical memory management functions (malloc and friends) with an


@@ -55,6 +55,6 @@ XBT_PUBLIC void* xbt_mheap_destroy(xbt_mheap_t md);
 xbt_mheap_t mmalloc_get_current_heap(void);
 
 #endif
 xbt_mheap_t mmalloc_get_current_heap(void);
 
 #endif

-SG_END_DECL()
+SG_END_DECL

 
 #endif /* SIMGRID_MMALLOC_H */
 
 #endif /* SIMGRID_MMALLOC_H */

diff --git a/src/mc/remote/mc_protocol.h b/src/mc/remote/mc_protocol.h
index fd79b48..3bf8823 100644 (file)
--- a/src/mc/remote/mc_protocol.h
+++ b/src/mc/remote/mc_protocol.h
@@ -10,7 +10,7 @@
 #include "simgrid/forward.h"
 #include "stdint.h"
 
 #include "simgrid/forward.h"
 #include "stdint.h"
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 // ***** Environment variables for passing context to the model-checked process
 
 
 // ***** Environment variables for passing context to the model-checked process
 


@@ -109,6 +109,6 @@ struct s_mc_message_actor_enabled_t {
 
 XBT_PRIVATE const char* MC_message_type_name(enum e_mc_message_type type);
 
 
 XBT_PRIVATE const char* MC_message_type_name(enum e_mc_message_type type);
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif
 
 #endif

diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h
index 1fad6b4..15a5d69 100644 (file)
--- a/src/xbt/dict_private.h
+++ b/src/xbt/dict_private.h
@@ -17,7 +17,7 @@
 #include "xbt/dict.h"
 #include "xbt/mallocator.h"
 
 #include "xbt/dict.h"
 #include "xbt/mallocator.h"
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 typedef struct s_xbt_dict {
   void_f_pvoid_t free_f;
 
 typedef struct s_xbt_dict {
   void_f_pvoid_t free_f;


@@ -37,6 +37,6 @@ XBT_PRIVATE xbt_dictelm_t xbt_dictelm_new(const char* key, int key_len, unsigned
 XBT_PRIVATE void xbt_dictelm_free(xbt_dict_t dict, xbt_dictelm_t element);
 XBT_PRIVATE void xbt_dictelm_set_data(xbt_dict_t dict, xbt_dictelm_t element, void* data);
 
 XBT_PRIVATE void xbt_dictelm_free(xbt_dict_t dict, xbt_dictelm_t element);
 XBT_PRIVATE void xbt_dictelm_set_data(xbt_dict_t dict, xbt_dictelm_t element, void* data);
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif
 
 #endif

diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h
index 7ed76dd..db3ee33 100644 (file)
--- a/src/xbt/mmalloc/mmprivate.h
+++ b/src/xbt/mmalloc/mmprivate.h
@@ -94,7 +94,7 @@
 
 #define ADDRESS(B) ((void*) (((ADDR2UINT(B)) - 1) * BLOCKSIZE + (char*) mdp -> heapbase))
 
 
 #define ADDRESS(B) ((void*) (((ADDR2UINT(B)) - 1) * BLOCKSIZE + (char*) mdp -> heapbase))
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 /* Doubly linked lists of free fragments.  */
 struct list {
 
 /* Doubly linked lists of free fragments.  */
 struct list {


@@ -293,6 +293,6 @@ XBT_PRIVATE int malloc_use_mmalloc(void);
 
 XBT_PRIVATE size_t mmalloc_get_bytes_used_remote(size_t heaplimit, const malloc_info* heapinfo);
 
 
 XBT_PRIVATE size_t mmalloc_get_bytes_used_remote(size_t heaplimit, const malloc_info* heapinfo);
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif
 
 #endif

diff --git a/src/xbt_modinter.h b/src/xbt_modinter.h
index 0b5b855..f7e2f17 100644 (file)
--- a/src/xbt_modinter.h
+++ b/src/xbt_modinter.h
@@ -9,7 +9,7 @@
 #define XBT_MODINTER_H
 #include "xbt/misc.h"
 
 #define XBT_MODINTER_H
 #include "xbt/misc.h"
 

-SG_BEGIN_DECL()
+SG_BEGIN_DECL

 
 /* Modules definitions */
 
 
 /* Modules definitions */
 


@@ -25,6 +25,6 @@ void mmalloc_postexit(void);
 extern int smx_cleaned;
 extern int xbt_initialized;
 
 extern int smx_cleaned;
 extern int xbt_initialized;
 

-SG_END_DECL()
+SG_END_DECL

 
 #endif
 
 #endif