X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1bf71617c94b4c2ff15ac076992a24a0fdbaa897..e95d2dda61913a92ff3a9d1b7c368ba6e1443b30:/src/surf/sg_platf.cpp

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 5a3578581a..3ed44de19f 100644
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -15,17 +15,17 @@
 #include "src/surf/cpu_interface.hpp"
 #include "src/surf/network_interface.hpp"
 
-#include "src/kernel/routing/ClusterZone.hpp"
-#include "src/kernel/routing/DijkstraZone.hpp"
-#include "src/kernel/routing/DragonflyZone.hpp"
-#include "src/kernel/routing/EmptyZone.hpp"
-#include "src/kernel/routing/FatTreeZone.hpp"
-#include "src/kernel/routing/FloydZone.hpp"
-#include "src/kernel/routing/FullZone.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
-#include "src/kernel/routing/NetZoneImpl.hpp"
-#include "src/kernel/routing/TorusZone.hpp"
-#include "src/kernel/routing/VivaldiZone.hpp"
+#include "simgrid/kernel/routing/ClusterZone.hpp"
+#include "simgrid/kernel/routing/DijkstraZone.hpp"
+#include "simgrid/kernel/routing/DragonflyZone.hpp"
+#include "simgrid/kernel/routing/EmptyZone.hpp"
+#include "simgrid/kernel/routing/FatTreeZone.hpp"
+#include "simgrid/kernel/routing/FloydZone.hpp"
+#include "simgrid/kernel/routing/FullZone.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/NetZoneImpl.hpp"
+#include "simgrid/kernel/routing/TorusZone.hpp"
+#include "simgrid/kernel/routing/VivaldiZone.hpp"
 #include <string>
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
 
@@ -394,7 +394,7 @@ void sg_platf_new_mount(MountCreationArgs* mount)
 
   if (mount_list.empty())
     XBT_DEBUG("Create a Mount list for %s", A_surfxml_host_id);
-  mount_list.insert({mount->name, simgrid::surf::StorageImpl::byName(mount->storageId.c_str())});
+  mount_list.insert({mount->name, simgrid::s4u::Engine::getInstance()->storageByName(mount->storageId)->getImpl()});
 }
 
 void sg_platf_new_route(RouteCreationArgs* route)
@@ -417,8 +417,7 @@ void sg_platf_new_actor(ActorCreationArgs* actor)
     std::string msg = std::string("Cannot create actor '") + actor->function + "': host '" + actor->host +
                       "' does not exist\nExisting hosts: '";
 
-    std::vector<simgrid::s4u::Host*> list;
-    simgrid::s4u::Engine::getInstance()->getHostList(&list);
+    std::vector<simgrid::s4u::Host*> list = simgrid::s4u::Engine::getInstance()->getAllHosts();
 
     for (auto const& host : list) {
       msg += host->getName();