sed -i -e 's/\t/ /g' [sources] Please people, stop using tabs

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

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index ad40084..9ff6964 100644 (file)
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -11,9 +11,13 @@
 
 #include "network_interface.hpp"
 
+namespace simgrid {
+namespace surf {
+
 /***********
  * Classes *
  ***********/
+ 
 class XBT_PRIVATE NetworkConstantModel;
 class XBT_PRIVATE NetworkConstantAction;
 
@@ -25,22 +29,22 @@ public:
   NetworkConstantModel()  : NetworkModel() { };
   ~NetworkConstantModel() { }
 
-  Action *communicate(RoutingEdge *src, RoutingEdge *dst, double size, double rate);
-  double shareResources(double now);
-  void updateActionsState(double now, double delta);
-  bool shareResourcesIsIdempotent() {return true;}
+  Action *communicate(NetCard *src, NetCard *dst, double size, double rate) override;
+  double shareResources(double now) override;
+  void updateActionsState(double now, double delta) override;
+  bool shareResourcesIsIdempotent() override {return true;}
 
-  Link* createLink(const char *name,
-                          double bw_initial,
-                                  tmgr_trace_t bw_trace,
-                                  double lat_initial,
-                                  tmgr_trace_t lat_trace,
-                                  e_surf_resource_state_t state_initial,
-                                  tmgr_trace_t state_trace,
-                                  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; }
+  Link*
+  createLink(const char *name,
+      double bw_initial,
+      tmgr_trace_t bw_trace,
+      double lat_initial,
+      tmgr_trace_t lat_trace,
+      int initiallyOn,
+      tmgr_trace_t state_trace,
+      e_surf_link_sharing_policy_t policy,
+      xbt_dict_t properties)          override { DIE_IMPOSSIBLE; }
+  void addTraces()                    override { DIE_IMPOSSIBLE; }
 };
 
 /**********
@@ -52,21 +56,19 @@ public:
   : NetworkAction(model_, size, false)
   , m_latInit(latency)
   {
-       m_latency = latency;
-       if (m_latency <= 0.0) {
-         p_stateSet = getModel()->getDoneActionSet();
-         p_stateSet->push_back(*this);
-       }
-       p_variable = NULL;
+  m_latency = latency;
+  if (m_latency <= 0.0) {
+    p_stateSet = getModel()->getDoneActionSet();
+    p_stateSet->push_back(*this);
+  }
+  p_variable = NULL;
   };
-  int unref();
-  void cancel();
-  void setCategory(const char *category);
-  void suspend();
-  void resume();
-  bool isSuspended();
+  int unref() override;
+  void cancel() override;
   double m_latInit;
-  int m_suspended;
 };
 
+}
+}
+
 #endif /* NETWORK_CONSTANT_HPP_ */