X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/24b63c987b1baf4e2fc2f68b00bd21c980eb8d6e..fd67e295641204d07b46527e4be0a0e8fe0c865e:/include/simgrid/s4u/As.hpp

diff --git a/include/simgrid/s4u/As.hpp b/include/simgrid/s4u/As.hpp
index 445424f164..32d50b595f 100644
--- a/include/simgrid/s4u/As.hpp
+++ b/include/simgrid/s4u/As.hpp
@@ -6,20 +6,25 @@
 #ifndef SIMGRID_S4U_AS_HPP
 #define SIMGRID_S4U_AS_HPP
 
-#include "xbt/base.h"
-#include "xbt/graph.h"
-
-#include "simgrid/s4u/forward.hpp"
-#include <vector>
 #include <map>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include <xbt/base.h>
+#include <xbt/graph.h>
+
+#include <simgrid/s4u/forward.hpp>
 
 #include "src/surf/xml/platf_private.hpp" // FIXME: kill sg_platf_route_cbarg_t to remove that UGLY include
 
 namespace simgrid {
 
 namespace surf {
-  class AsImpl;
   class Link;
+}
+namespace routing {
+  class AsImpl;
   class NetCard;
 }
 namespace s4u {
@@ -31,7 +36,7 @@ namespace s4u {
  */
 XBT_PUBLIC_CLASS As {
 protected:
-  friend simgrid::surf::AsImpl;
+  friend simgrid::routing::AsImpl;
 
   explicit As(const char *name);
   virtual ~As();
@@ -47,7 +52,7 @@ public:
   As *father_ = nullptr; // FIXME: hide me
 public:
   /* Add content to the AS, at parsing time. It should be sealed afterward. */
-  virtual int addComponent(surf::NetCard *elm); /* A host, a router or an AS, whatever */
+  virtual int addComponent(routing::NetCard *elm); /* A host, a router or an AS, whatever */
   virtual void addRoute(sg_platf_route_cbarg_t route);
   void addBypassRoute(sg_platf_route_cbarg_t e_route);