Use C++ style includes when available.

[simgrid.git] / 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 523080c..a45915e 100644 (file)
--- a/teshsuite/simdag/is-router/is-router.cpp
+++ b/teshsuite/simdag/is-router/is-router.cpp
@@ -7,7 +7,8 @@
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/simdag.h"
 #include "src/kernel/routing/NetPoint.hpp"
-#include <stdio.h>
+#include <algorithm>
+#include <cstdio>
 
 int main(int argc, char **argv)
 {
@@ -18,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();
@@ -35,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);