X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/121e1dc6ee0462b6f6f1f1570b0f48c61ee4ff9a..5e472a6023eb14e7396b16fa4eb47c805d8f4acf:/teshsuite/simdag/is-router/is-router.cpp

diff --git a/teshsuite/simdag/is-router/is-router.cpp b/teshsuite/simdag/is-router/is-router.cpp
index 242d10bc89..a45915ed96 100644
--- a/teshsuite/simdag/is-router/is-router.cpp
+++ b/teshsuite/simdag/is-router/is-router.cpp
@@ -7,8 +7,8 @@
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/simdag.h"
 #include "src/kernel/routing/NetPoint.hpp"
-#include "surf/surf_routing.h"
-#include <stdio.h>
+#include <algorithm>
+#include <cstdio>
 
 int main(int argc, char **argv)
 {
@@ -19,7 +19,7 @@ int main(int argc, char **argv)
   std::printf("Host count: %zu, link number: %d\n", sg_host_count(), sg_link_count());
 
   std::vector<simgrid::kernel::routing::NetPoint*> netcardList;
-  simgrid::s4u::Engine::instance()->netpointList(&netcardList);
+  simgrid::s4u::Engine::getInstance()->getNetpointList(&netcardList);
   std::sort(netcardList.begin(), netcardList.end(),
             [](simgrid::kernel::routing::NetPoint* a, simgrid::kernel::routing::NetPoint* b) {
               return a->name() < b->name();
@@ -36,7 +36,7 @@ int main(int argc, char **argv)
       type = "netzone";
     if (nc->isHost())
       type = "host";
-    std::printf("   - Seen: \"%s\". Type: %s\n", host->cname(), type);
+    std::printf("   - Seen: \"%s\". Type: %s\n", host->getCname(), type);
   }
   xbt_dynar_free(&hosts);
 
@@ -45,6 +45,5 @@ int main(int argc, char **argv)
     std::printf("   - Seen: \"%s\". Type: %s\n", nc->cname(),
                 nc->isRouter() ? "router" : (nc->isNetZone() ? "netzone" : (nc->isHost() ? "host" : "buggy")));
 
-  SD_exit();
   return 0;
 }