X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b049bada6ece9a57127a23fc04c542298518dc00..c9197fe448d95724ea56119ac409e6460ed86b8a:/src/surf/surf_routing.hpp diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp index 61983b46bd..8645ad765d 100644 --- a/src/surf/surf_routing.hpp +++ b/src/surf/surf_routing.hpp @@ -12,7 +12,7 @@ #include "surf_interface.hpp" #include "src/surf/xml/platf_private.hpp" // FIXME: including this here is pure madness. KILKILKIL XML. -#include "src/routing/AsImpl.hpp" +#include "src/kernel/routing/AsImpl.hpp" #include #include @@ -24,6 +24,7 @@ XBT_PRIVATE xbt_edge_t new_xbt_graph_edge (xbt_graph_t graph, xbt_node_t s, xbt_ SG_END_DECL() namespace simgrid { +namespace kernel { namespace routing { XBT_PUBLIC_DATA(simgrid::xbt::signal) asCreatedCallbacks; @@ -64,7 +65,7 @@ public: { if (containingAS != nullptr) id_ = containingAS->addComponent(this); - simgrid::routing::netcardCreatedCallbacks(this); + simgrid::kernel::routing::netcardCreatedCallbacks(this); } ~NetCardImpl() { xbt_free(name_);}; @@ -108,7 +109,6 @@ public: void getRouteAndLatency(NetCard *src, NetCard *dst, std::vector * links, double *latency); }; -} -} +}}} #endif /* NETWORK_ROUTING_HPP_ */