Update copyright lines with new year.

[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 8666fe7..d5bed78 100644 (file)
--- a/teshsuite/simdag/is-router/is-router.cpp
+++ b/teshsuite/simdag/is-router/is-router.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-2020. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -22,14 +22,14 @@ int main(int argc, char **argv)
   std::vector<simgrid::kernel::routing::NetPoint*> netpoints =
       simgrid::s4u::Engine::get_instance()->get_all_netpoints();
   std::sort(netpoints.begin(), netpoints.end(),
-            [](simgrid::kernel::routing::NetPoint* a, simgrid::kernel::routing::NetPoint* b) {
+            [](const simgrid::kernel::routing::NetPoint* a, const simgrid::kernel::routing::NetPoint* b) {
               return a->get_name() < b->get_name();
             });
 
   int it;
   sg_host_t host;
   xbt_dynar_foreach(hosts, it, host) {
-    simgrid::kernel::routing::NetPoint* nc = host->pimpl_netpoint;
+    const simgrid::kernel::routing::NetPoint* nc = host->get_netpoint();
     const char *type = "buggy";
     if (nc->is_router())
       type = "router";
@@ -42,9 +42,17 @@ int main(int argc, char **argv)
   xbt_dynar_free(&hosts);
 
   std::printf("NetCards count: %zu\n", netpoints.size());
-  for (auto const& nc : netpoints)
-    std::printf("   - Seen: \"%s\". Type: %s\n", nc->get_cname(),
-                nc->is_router() ? "router" : (nc->is_netzone() ? "netzone" : (nc->is_host() ? "host" : "buggy")));
-
+  for (auto const& nc : netpoints) {
+    const char* type;
+    if (nc->is_router())
+      type = "router";
+    else if (nc->is_netzone())
+      type = "netzone";
+    else if (nc->is_host())
+      type = "host";
+    else
+      type = "buggy";
+    std::printf("   - Seen: \"%s\". Type: %s\n", nc->get_cname(), type);
+  }
   return 0;
 }