Rename RoutingEdge into NetCard

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

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index dc691d0..8d7e33a 100644 (file)
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -13,13 +13,22 @@
 #include "xbt/fifo.h"
 #include "xbt/graph.h"
 
+
+
 /***********
  * Classes *
  ***********/
+
+namespace simgrid {
+namespace surf {
+
 class XBT_PRIVATE NetworkCm02Model;
 class XBT_PRIVATE NetworkCm02Action;
 class XBT_PRIVATE NetworkSmpiModel;
 
+}
+}
+
 /*********
  * Tools *
  *********/
@@ -29,6 +38,10 @@ XBT_PRIVATE void net_define_callbacks(void);
 /*********
  * Model *
  *********/
+
+namespace simgrid {
+namespace surf {
+
 class NetworkCm02Model : public NetworkModel {
 private:
   void initialize();
@@ -48,7 +61,7 @@ public:
   void addTraces();
   void updateActionsStateLazy(double now, double delta);
   void updateActionsStateFull(double now, double delta);
-  Action *communicate(RoutingEdge *src, RoutingEdge *dst,
+  Action *communicate(NetCard *src, NetCard *dst,
                                           double size, double rate);
   bool shareResourcesIsIdempotent() {return true;}
   virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {};
@@ -85,7 +98,7 @@ public:
  * Action *
  **********/
 class NetworkCm02Action : public NetworkAction {
-  friend Action *NetworkCm02Model::communicate(RoutingEdge *src, RoutingEdge *dst, double size, double rate);
+  friend Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, double rate);
   friend NetworkSmpiModel;
 
 public:
@@ -96,4 +109,7 @@ protected:
   double m_senderGap;
 };
 
+}
+}
+
 #endif /* SURF_NETWORK_CM02_HPP_ */