Merge branch 'master' into adrien

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

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 1e2286c..9c8f230 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -197,7 +197,7 @@ int find_model_description(const std::vector<surf_model_description_t>& table, c
   auto pos = std::find_if(table.begin(), table.end(),
                           [&name](const surf_model_description_t& item) { return item.name == name; });
   if (pos != table.end())
-    return std::distance(table.begin(), pos);
+    return static_cast<int>(std::distance(table.begin(), pos));
 
   if (table.empty())
     xbt_die("No model is valid! This is a bug.");
@@ -222,9 +222,6 @@ void surf_init(int *argc, char **argv)
   xbt_init(argc, argv);
 
   sg_config_init(argc, argv);
-
-  if (MC_is_active())
-    MC_memory_init();
 }
 
 void surf_exit()