X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6176245c992a91d94dddf0b68276129f1c18a1aa..c1194401ce4a41ff54a7591f4cf33c9ce2756978:/src/surf/surf_interface.cpp

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index a9b5a1819f..8beb759567 100644
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -34,7 +34,7 @@ simgrid::kernel::profile::FutureEvtSet future_evt_set;
 std::vector<std::string> surf_path;
 /**  set of hosts for which one want to be notified if they ever restart. */
 std::set<std::string> watched_hosts;
-extern std::map<std::string, simgrid::surf::StorageType*> storage_types;
+extern std::map<std::string, simgrid::kernel::resource::StorageType*> storage_types;
 
 s_surf_model_description_t* surf_plugin_description = nullptr;
 XBT_PUBLIC void simgrid_add_plugin_description(const char* name, const char* description, void_f_void_t init_fun)
@@ -127,7 +127,7 @@ double surf_get_clock()
 }
 
 /* returns whether #file_path is a absolute file path. Surprising, isn't it ? */
-static bool is_absolute_file_path(std::string file_path)
+static bool is_absolute_file_path(const std::string& file_path)
 {
 #ifdef _WIN32
   WIN32_FIND_DATA wfd = {0};
@@ -143,7 +143,7 @@ static bool is_absolute_file_path(std::string file_path)
 #endif
 }
 
-std::ifstream* surf_ifsopen(std::string name)
+std::ifstream* surf_ifsopen(const std::string& name)
 {
   xbt_assert(not name.empty());
 
@@ -166,7 +166,7 @@ std::ifstream* surf_ifsopen(std::string name)
   return fs;
 }
 
-FILE* surf_fopen(std::string name, const char* mode)
+FILE* surf_fopen(const std::string& name, const char* mode)
 {
   FILE *file = nullptr;
 
@@ -192,7 +192,7 @@ void model_help(const char *category, s_surf_model_description_t * table)
     printf("  %s: %s\n", table[i].name, table[i].description);
 }
 
-int find_model_description(s_surf_model_description_t* table, std::string name)
+int find_model_description(s_surf_model_description_t* table, const std::string& name)
 {
   for (int i = 0; table[i].name; i++)
     if (name == table[i].name)
@@ -305,7 +305,7 @@ void surf_exit()
 {
   simgrid::s4u::Engine::shutdown();
   for (auto const& e : storage_types) {
-    simgrid::surf::StorageType* stype = e.second;
+    simgrid::kernel::resource::StorageType* stype = e.second;
     delete stype->properties;
     delete stype->model_properties;
     delete stype;