[sonar] Constify pointer and reference local variables in src/surf/.

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

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 3f3dc80..18620ac 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -9,7 +9,6 @@
 #include "simgrid/sg_config.hpp"
 #include "src/kernel/resource/profile/FutureEvtSet.hpp"
 #include "src/kernel/resource/profile/Profile.hpp"
-#include "src/simgrid/version.h"
 #include "src/surf/HostImpl.hpp"
 #include "src/surf/xml/platf.hpp"
 #include "src/xbt_modinter.h" /* whether initialization was already done */
@@ -49,7 +48,7 @@ static void XBT_ATTRIB_DESTRUCTOR(800) simgrid_free_plugin_description()
 XBT_PUBLIC void simgrid_add_plugin_description(const char* name, const char* description, void_f_void_t init_fun)
 {
   if (not surf_plugin_description)
-    surf_plugin_description = new std::vector<surf_model_description_t>;
+    surf_plugin_description = new std::vector<surf_model_description_t>();
   surf_plugin_description->emplace_back(surf_model_description_t{name, description, init_fun});
 }
 
@@ -214,81 +213,6 @@ int find_model_description(const std::vector<surf_model_description_t>& table, c
   return -1;
 }
 
-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 > 89 || lib_version_patch > 89) {
-      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);
-  }
-}
-
-void sg_version_get(int* ver_major, int* ver_minor, int* ver_patch)
-{
-  *ver_major = SIMGRID_VERSION_MAJOR;
-  *ver_minor = SIMGRID_VERSION_MINOR;
-  *ver_patch = SIMGRID_VERSION_PATCH;
-}
-
-void sg_version()
-{
-  XBT_HELP("This program was linked against %s (git: %s), found in %s.", SIMGRID_VERSION_STRING, SIMGRID_GIT_VERSION,
-           SIMGRID_INSTALL_PREFIX);
-
-#if SIMGRID_HAVE_MC
-  XBT_HELP("   Model-checking support compiled in.");
-#else
-  XBT_HELP("   Model-checking support disabled at compilation.");
-#endif
-
-#if SIMGRID_HAVE_NS3
-  XBT_HELP("   ns-3 support compiled in.");
-#else
-  XBT_HELP("   ns-3 support disabled at compilation.");
-#endif
-
-#if SIMGRID_HAVE_JEDULE
-  XBT_HELP("   Jedule support compiled in.");
-#else
-  XBT_HELP("   Jedule support disabled at compilation.");
-#endif
-
-#if SIMGRID_HAVE_LUA
-  XBT_HELP("   Lua support compiled in.");
-#else
-  XBT_HELP("   Lua support disabled at compilation.");
-#endif
-
-#if SIMGRID_HAVE_MALLOCATOR
-  XBT_HELP("   Mallocator support compiled in.");
-#else
-  XBT_HELP("   Mallocator support disabled at compilation.");
-#endif
-
-  XBT_HELP("\nTo cite SimGrid in a publication, please use:\n"
-           "   Henri Casanova, Arnaud Giersch, Arnaud Legrand, Martin Quinson, Frédéric Suter. \n"
-           "   Versatile, Scalable, and Accurate Simulation of Distributed Applications and Platforms. \n"
-           "   Journal of Parallel and Distributed Computing, Elsevier, 2014, 74 (10), pp.2899-2917.\n"
-           "The pdf file and a BibTeX entry for LaTeX users can be found at http://hal.inria.fr/hal-01017319");
-}
 
 void surf_init(int *argc, char **argv)
 {
@@ -307,7 +231,7 @@ void surf_exit()
 {
   simgrid::s4u::Engine::shutdown();
   for (auto const& e : storage_types) {
-    simgrid::kernel::resource::StorageType* stype = e.second;
+    const simgrid::kernel::resource::StorageType* stype = e.second;
     delete stype->properties;
     delete stype->model_properties;
     delete stype;