Merge pull request #179 from Takishipp/signals

[simgrid.git] / src / surf / surf_interface.cpp

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index cbb08ad..f318471 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -32,8 +32,7 @@ extern std::map<std::string, storage_type_t> storage_types;
 namespace simgrid {
 namespace surf {
 
-simgrid::xbt::signal<void(void)> surfExitCallbacks;
-
+simgrid::xbt::signal<void()> surfExitCallbacks;
 }
 }
 
@@ -147,7 +146,6 @@ std::ifstream* surf_ifsopen(const char* name)
 }
 FILE *surf_fopen(const char *name, const char *mode)
 {
-  char *buff;
   FILE *file = nullptr;
 
   xbt_assert(name);
@@ -157,7 +155,7 @@ FILE *surf_fopen(const char *name, const char *mode)
 
   /* search relative files in the path */
   for (auto path_elm : surf_path) {
-    buff = bprintf("%s" FILE_DELIM "%s", path_elm.c_str(), name);
+    char* buff = bprintf("%s" FILE_DELIM "%s", path_elm.c_str(), name);
     file = fopen(buff, mode);
     free(buff);
 
@@ -260,34 +258,34 @@ int find_model_description(s_surf_model_description_t * table,
 
 static inline void surf_storage_free(void *r)
 {
-  delete static_cast<simgrid::surf::Storage*>(r);
+  delete static_cast<simgrid::surf::StorageImpl*>(r);
 }
 
-void sg_version_check(int lib_version_major,int lib_version_minor,int lib_version_patch) {
-    if ((lib_version_major != SIMGRID_VERSION_MAJOR) || (lib_version_minor != SIMGRID_VERSION_MINOR)) {
-      fprintf(stderr,
+void sg_version_check(int lib_version_major, int lib_version_minor, int lib_version_patch)
+{
+  if ((lib_version_major != SIMGRID_VERSION_MAJOR) || (lib_version_minor != SIMGRID_VERSION_MINOR)) {
+    fprintf(stderr, "FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, "
+                    "and then linked against SimGrid %d.%d.%d. Please fix this.\n",
+            lib_version_major, lib_version_minor, lib_version_patch, SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR,
+            SIMGRID_VERSION_PATCH);
+    abort();
+  }
+  if (lib_version_patch != SIMGRID_VERSION_PATCH) {
+    if (SIMGRID_VERSION_PATCH >= 90 || lib_version_patch >= 90) {
+      fprintf(
+          stderr,
           "FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, "
-          "and then linked against SimGrid %d.%d.%d. Please fix this.\n",
-          lib_version_major,lib_version_minor,lib_version_patch,
-          SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH);
+          "and then linked against SimGrid %d.%d.%d. \n"
+          "One of them is a development version, and should not be mixed with the stable release. Please fix this.\n",
+          lib_version_major, lib_version_minor, lib_version_patch, SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR,
+          SIMGRID_VERSION_PATCH);
       abort();
     }
-    if (lib_version_patch != SIMGRID_VERSION_PATCH) {
-      if(SIMGRID_VERSION_PATCH >= 90 || lib_version_patch >=90){
-        fprintf(stderr,
-        "FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, "
-        "and then linked against SimGrid %d.%d.%d. \n"
-        "One of them is a development version, and should not be mixed with the stable release. Please fix this.\n",
-        lib_version_major,lib_version_minor,lib_version_patch,
-        SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH);
-        abort();
-      }
-        fprintf(stderr,
-            "Warning: Your program was compiled with SimGrid version %d.%d.%d, "
-            "and then linked against SimGrid %d.%d.%d. Proceeding anyway.\n",
-            lib_version_major,lib_version_minor,lib_version_patch,
-            SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH);
-    }
+    fprintf(stderr, "Warning: Your program was compiled with SimGrid version %d.%d.%d, "
+                    "and then linked against SimGrid %d.%d.%d. Proceeding anyway.\n",
+            lib_version_major, lib_version_minor, lib_version_patch, SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR,
+            SIMGRID_VERSION_PATCH);
+  }
 }
 
 void sg_version_get(int* ver_major, int* ver_minor, int* ver_patch)
@@ -578,7 +576,7 @@ bool Resource::isOn() const {
   return isOn_;
 }
 bool Resource::isOff() const {
-  return ! isOn_;
+  return not isOn_;
 }
 
 void Resource::turnOn()