X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/faedb72df7cffcf486677835fdd57d319a010bb1..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/surf/network_cm02.hpp?ds=sidebyside

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index 689ba92e34..f20a8cafd8 100644
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -17,31 +17,26 @@
  ***********/
 
 namespace simgrid {
-  namespace surf {
+namespace kernel {
+namespace resource {
 
-    class XBT_PRIVATE NetworkCm02Model;
-    class XBT_PRIVATE NetworkCm02Action;
-    class XBT_PRIVATE NetworkSmpiModel;
-
-  }
-}
+class XBT_PRIVATE NetworkCm02Model;
+class XBT_PRIVATE NetworkCm02Action;
+class XBT_PRIVATE NetworkSmpiModel;
 
 /*********
  * Model *
  *********/
 
-namespace simgrid {
-namespace surf {
-
 class NetworkCm02Model : public NetworkModel {
 public:
-  explicit NetworkCm02Model(kernel::lmm::System* (*make_new_sys)(bool) = &simgrid::kernel::lmm::make_new_maxmin_system);
+  explicit NetworkCm02Model(lmm::System* (*make_new_sys)(bool) = &lmm::make_new_maxmin_system);
   virtual ~NetworkCm02Model() = default;
   LinkImpl* createLink(const std::string& name, double bandwidth, double latency,
-                       e_surf_link_sharing_policy_t policy) override;
+                       s4u::Link::SharingPolicy policy) override;
   void update_actions_state_lazy(double now, double delta) override;
   void update_actions_state_full(double now, double delta) override;
-  kernel::resource::Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
+  Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
 };
 
 /************
@@ -51,7 +46,7 @@ public:
 class NetworkCm02Link : public LinkImpl {
 public:
   NetworkCm02Link(NetworkCm02Model* model, const std::string& name, double bandwidth, double latency,
-                  e_surf_link_sharing_policy_t policy, kernel::lmm::System* system);
+                  s4u::Link::SharingPolicy policy, lmm::System* system);
   virtual ~NetworkCm02Link() = default;
   void apply_event(tmgr_trace_event_t event, double value) override;
   void setBandwidth(double value) override;
@@ -66,11 +61,11 @@ class NetworkCm02Action : public NetworkAction {
   friend NetworkSmpiModel;
 
 public:
-  NetworkCm02Action(kernel::resource::Model* model, double cost, bool failed) : NetworkAction(model, cost, failed){};
+  NetworkCm02Action(Model* model, double cost, bool failed) : NetworkAction(model, cost, failed){};
   virtual ~NetworkCm02Action() = default;
   void update_remains_lazy(double now) override;
 };
 }
 }
-
+} // namespace simgrid
 #endif /* SURF_NETWORK_CM02_HPP_ */