[s4u] add Actor::getPPid and this_actor::getPPid()

[simgrid.git] / include / simgrid / s4u / As.hpp

diff --git a/include/simgrid/s4u/As.hpp b/include/simgrid/s4u/As.hpp
index 3106d01..50c4854 100644 (file)
--- a/include/simgrid/s4u/As.hpp
+++ b/include/simgrid/s4u/As.hpp
@@ -6,12 +6,15 @@
 #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
 
@@ -20,9 +23,11 @@ namespace simgrid {
 namespace surf {
   class Link;
 }
-namespace routing {
-  class AsImpl;
-  class NetCard;
+namespace kernel {
+  namespace routing {
+    class AsImpl;
+    class NetCard;
+  }
 }
 namespace s4u {
 
@@ -33,7 +38,7 @@ namespace s4u {
  */
 XBT_PUBLIC_CLASS As {
 protected:
-  friend simgrid::routing::AsImpl;
+  friend simgrid::kernel::routing::AsImpl;
 
   explicit As(const char *name);
   virtual ~As();
@@ -49,7 +54,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(routing::NetCard *elm); /* A host, a router or an AS, whatever */
+  virtual int addComponent(kernel::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);