Give a p_netcard to simgrid::Host instead of relying on extensions for that

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

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index 5789d59..0d322d8 100644 (file)
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -62,11 +62,6 @@ namespace surf {
 }
 #endif
 
-#ifdef _MSC_VER
-#pragma warning( disable : 4251)
-// 4251: needs to have dll-interface to be used by clients of class
-#endif
-
 extern XBT_PRIVATE tmgr_history_t history;
 #define NO_MAX_DURATION -1.0
 
@@ -297,7 +292,7 @@ protected:
   lmm_variable_t p_variable;
   double m_lastValue;
   double m_lastUpdate;
-  int m_suspended;
+  int m_suspended = 0;
   int m_indexHeap;
   enum heap_action_type m_hat;
 };
@@ -483,12 +478,7 @@ public:
   /** @brief Set the [state](\ref e_surf_resource_state_t) of the current Resource */
   virtual void setState(e_surf_resource_state_t state);
 
-protected:
-  void die();
-  virtual void onDie();
-
 private:
-  bool alive_ = true;
   const char *p_name;
   Model *p_model;
   bool m_running;
@@ -498,7 +488,7 @@ private:
 public: /* LMM */
   /** @brief Get the lmm constraint associated to this Resource if it is part of a LMM component */
   lmm_constraint_t getConstraint();
-private:
+protected:
   lmm_constraint_t p_constraint;
 };