fix cxx flag for win build

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

diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index f863cb3..bd5543f 100644 (file)
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -4,7 +4,7 @@
  *  Created on: Nov 29, 2013
  *      Author: bedaride
  */
-#include "surf.hpp"
+#include "surf_interface.hpp"
 #include "surf_routing.hpp"
 
 #ifndef SURF_NETWORK_INTERFACE_HPP_
@@ -41,7 +41,7 @@ class NetworkModel : public Model {
 public:
   NetworkModel() : Model("network") {
   };
-  NetworkModel(string name) : Model(name) {
+  NetworkModel(const char *name) : Model(name) {
        f_networkSolve = lmm_solve;
        m_haveGap = false;
   };
@@ -94,21 +94,15 @@ public:
 };
 
 class NetworkLinkLmm : public ResourceLmm, public NetworkLink {
+protected:
 public:
   NetworkLinkLmm() {};
-  NetworkLinkLmm(lmm_system_t system,
-                    double constraint_value,
-                    tmgr_history_t history,
-                    e_surf_resource_state_t state_init,
-                    tmgr_trace_t state_trace,
-                    double metric_peak,
-                    tmgr_trace_t metric_trace)
- : ResourceLmm(system, constraint_value, history, state_init, state_trace, metric_peak, metric_trace)
-{
-}
+  NetworkLinkLmm(lmm_constraint_t constraint, tmgr_history_t history, tmgr_trace_t state_trace);
   bool isShared();
   bool isUsed();
   double getBandwidth();
+  tmgr_trace_event_t p_stateEvent;
+  s_surf_metric_t p_power;
 };
 
 /**********