Rename RoutingEdge into NetCard

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

diff --git a/src/surf/surf_routing_full.hpp b/src/surf/surf_routing_full.hpp
index bd0c712..4a6676f 100644 (file)
--- a/src/surf/surf_routing_full.hpp
+++ b/src/surf/surf_routing_full.hpp
@@ -1,18 +1,23 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* 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 "surf_routing_generic.hpp"
-
 #ifndef SURF_ROUTING_FULL_HPP_
 #define SURF_ROUTING_FULL_HPP_
 
+#include <xbt/base.h>
+
+#include "surf_routing_generic.hpp"
+
+namespace simgrid {
+namespace surf {
+
 /***********
  * Classes *
  ***********/
-class AsFull;
+class XBT_PRIVATE AsFull;
 
 class AsFull: public AsGeneric {
 public:
@@ -21,7 +26,7 @@ public:
   AsFull();
   ~AsFull();
 
-  void getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, sg_platf_route_cbarg_t into, double *latency);
+  void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency);
   xbt_dynar_t getOneLinkRoutes();
   void parseRoute(sg_platf_route_cbarg_t route);
   void parseASroute(sg_platf_route_cbarg_t route);
@@ -39,5 +44,7 @@ public:
   //virtual void parseBypassroute(sg_platf_route_cbarg_t e_route)=0;
 };
 
+}
+}
 
 #endif /* SURF_ROUTING_FULL_HPP_ */