move parts of the kernel to the right subdir

[simgrid.git] / src / s4u / s4u_as.cpp

diff --git a/src/s4u/s4u_as.cpp b/src/s4u/s4u_as.cpp
index 7dae44a..2e798e4 100644 (file)
--- a/src/s4u/s4u_as.cpp
+++ b/src/s4u/s4u_as.cpp
@@ -4,9 +4,11 @@
 /* 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. */
 
-#include "xbt/log.h"
+#include <xbt/log.h>
+
+#include <simgrid/s4u/host.hpp>
+#include <simgrid/s4u/As.hpp>
 
-#include "simgrid/s4u/As.hpp"
 #include "src/surf/surf_routing.hpp"
 #include "src/surf/network_interface.hpp" // Link FIXME: move to proper header
 
@@ -57,7 +59,7 @@ namespace simgrid {
       xbt_dynar_t res =  xbt_dynar_new(sizeof(sg_host_t), nullptr);
 
       for (unsigned int index = 0; index < xbt_dynar_length(vertices_); index++) {
-        simgrid::surf::NetCard *card = xbt_dynar_get_as(vertices_, index, simgrid::surf::NetCard*);
+        simgrid::routing::NetCard *card = xbt_dynar_get_as(vertices_, index, simgrid::routing::NetCard*);
         simgrid::s4u::Host     *host = simgrid::s4u::Host::by_name_or_null(card->name());
         if (host!=nullptr)
           xbt_dynar_push(res, &host);
@@ -65,8 +67,8 @@ namespace simgrid {
       return res;
     }
 
-    int As::addComponent(surf::NetCard *elm) {
-      xbt_dynar_push_as(vertices_, surf::NetCard*, elm);
+    int As::addComponent(routing::NetCard *elm) {
+      xbt_dynar_push_as(vertices_, routing::NetCard*, elm);
       return xbt_dynar_length(vertices_)-1;
     }