From 00bc7629efb0bc224e7c526993a17fc6bcac09c8 Mon Sep 17 00:00:00 2001 From: Takishipp Date: Fri, 2 Jun 2017 10:51:55 +0200 Subject: [PATCH] add nochecking for sd initialization --- include/simgrid/simdag.h | 8 +++++++- src/simdag/sd_global.cpp | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h index 2a01b473b9..d8176659a1 100644 --- a/include/simgrid/simdag.h +++ b/include/simgrid/simdag.h @@ -140,7 +140,13 @@ XBT_PUBLIC(int) SD_task_dependency_exists(SD_task_t src, SD_task_t dst); * * @{ */ -XBT_PUBLIC(void) SD_init(int *argc, char **argv); + +#define SD_init(argc,argv) do { \ + sg_version_check(SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH);\ + SD_init_nocheck(argc,argv); \ +} while (0) + +XBT_PUBLIC(void) SD_init_nocheck(int *argc, char **argv); XBT_PUBLIC(void) SD_config(const char *key, const char *value); XBT_PUBLIC(void) SD_create_environment(const char *platform_file); XBT_PUBLIC(void) SD_simulate(double how_long); diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp index fe907760eb..61fdcf53b0 100644 --- a/src/simdag/sd_global.cpp +++ b/src/simdag/sd_global.cpp @@ -152,7 +152,7 @@ const char *__get_state_name(e_SD_task_state_t state){ * \param argv argument list * \see SD_create_environment(), SD_exit() */ -void SD_init(int *argc, char **argv) +void SD_init_nocheck(int *argc, char **argv) { xbt_assert(sd_global == nullptr, "SD_init() already called"); -- 2.20.1