[SMPI] Move instr_find_color to C++

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

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index c2219d9..b3eb629 100644 (file)
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -26,27 +26,26 @@ class XBT_PRIVATE NetworkConstantAction;
  *********/
 class NetworkConstantModel : public NetworkModel {
 public:
-  NetworkConstantModel() : NetworkModel(Model::UpdateAlgo::Full) {}
+  NetworkConstantModel() : NetworkModel(Model::UpdateAlgo::FULL) {}
   Action* communicate(simgrid::s4u::Host* src, simgrid::s4u::Host* dst, double size, double rate) override;
   double next_occuring_event(double now) override;
   void update_actions_state(double now, double delta) override;
 
-  LinkImpl* createLink(const std::string& name, double bw, double lat, e_surf_link_sharing_policy_t policy) override;
-    };
-
-    /**********
-     * Action *
-     **********/
-    class NetworkConstantAction : public NetworkAction {
-    public:
-      NetworkConstantAction(NetworkConstantModel *model_, double size, double latency);
-      ~NetworkConstantAction();
-      double initialLatency_;
-      void update_remains_lazy(double now) override;
-    };
-
-  }
+  LinkImpl* createLink(const std::string& name, double bw, double lat, s4u::Link::SharingPolicy policy) override;
+};
+
+/**********
+ * Action *
+ **********/
+class NetworkConstantAction : public NetworkAction {
+public:
+  NetworkConstantAction(NetworkConstantModel* model_, double size, double latency);
+  ~NetworkConstantAction();
+  double initialLatency_;
+  void update_remains_lazy(double now) override;
+};
 }
+} // namespace kernel
 } // namespace simgrid
 
 #endif /* NETWORK_CONSTANT_HPP_ */