Simplify the code taking Cpu::m_speedPeak changes into account

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

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index 2dc6681..8f3e1b9 100644 (file)
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -7,13 +7,19 @@
 #ifndef NETWORK_CONSTANT_HPP_
 #define NETWORK_CONSTANT_HPP_
 
+#include <xbt/base.h>
+
 #include "network_interface.hpp"
 
+namespace simgrid {
+namespace surf {
+
 /***********
  * Classes *
  ***********/
-class NetworkConstantModel;
-class NetworkConstantAction;
+ 
+class XBT_PRIVATE NetworkConstantModel;
+class XBT_PRIVATE NetworkConstantAction;
 
 /*********
  * Model *
@@ -23,7 +29,7 @@ public:
   NetworkConstantModel()  : NetworkModel() { };
   ~NetworkConstantModel() { }
 
-  Action *communicate(RoutingEdge *src, RoutingEdge *dst, double size, double rate);
+  Action *communicate(NetCard *src, NetCard *dst, double size, double rate);
   double shareResources(double now);
   void updateActionsState(double now, double delta);
   bool shareResourcesIsIdempotent() {return true;}
@@ -38,7 +44,7 @@ public:
                                   e_surf_link_sharing_policy_t policy,
                                   xbt_dict_t properties)                  { DIE_IMPOSSIBLE; }
   void addTraces()                                         { DIE_IMPOSSIBLE; }
-  xbt_dynar_t getRoute(RoutingEdge *src, RoutingEdge *dst) { DIE_IMPOSSIBLE; }
+  xbt_dynar_t getRoute(NetCard *src, NetCard *dst) { DIE_IMPOSSIBLE; }
 };
 
 /**********
@@ -67,4 +73,7 @@ public:
   int m_suspended;
 };
 
+}
+}
+
 #endif /* NETWORK_CONSTANT_HPP_ */