next release is 3.14

[simgrid.git] / src / surf / surf_routing.hpp

diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index a0c2e3b..64b1b70 100644 (file)
--- a/src/surf/surf_routing.hpp
+++ b/src/surf/surf_routing.hpp
@@ -9,8 +9,8 @@
 #include <xbt/base.h>
 #include <xbt/signal.hpp>
 
+#include "src/kernel/routing/NetZoneImpl.hpp"
 #include "surf_interface.hpp"
-#include "src/kernel/routing/AsImpl.hpp"
 
 #include <float.h>
 #include <vector>
@@ -20,38 +20,4 @@ XBT_PRIVATE xbt_node_t new_xbt_graph_node (xbt_graph_t graph, const char *name,
 XBT_PRIVATE xbt_edge_t new_xbt_graph_edge (xbt_graph_t graph, xbt_node_t s, xbt_node_t d, xbt_dict_t edges);
 SG_END_DECL()
 
-namespace simgrid {
-namespace kernel {
-namespace routing {
-
-  XBT_PUBLIC_DATA(simgrid::xbt::signal<void(s4u::As*)>) asCreatedCallbacks;
-
-/***********
- * Classes *
- ***********/
-
-class XBT_PRIVATE Onelink;
-class RoutingPlatf;
-
-class AsRoute {
-public:
-  explicit AsRoute(NetCard* gwSrc, NetCard* gwDst) : gw_src(gwSrc), gw_dst(gwDst) {}
-  const NetCard* gw_src;
-  const NetCard* gw_dst;
-  std::vector<Link*> links;
-};
-
-/** @ingroup SURF_routing_interface
- * @brief Link of length 1, alongside with its source and destination. This is mainly useful in the ns3 bindings
- */
-class Onelink {
-public:
-  Onelink(Link* link, NetCard* src, NetCard* dst) : src_(src), dst_(dst), link_(link) {}
-  NetCard* src_;
-  NetCard* dst_;
-  Link* link_;
-};
-
-}}}
-
 #endif /* NETWORK_ROUTING_HPP_ */