X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/399e4077a352ec6e0ad4134e5645a29d0d241c88..e049fe573b321fbf974191c9f084873dc306009c:/src/surf/surf.hpp diff --git a/src/surf/surf.hpp b/src/surf/surf.hpp index 89ed8efe55..862173d4cf 100644 --- a/src/surf/surf.hpp +++ b/src/surf/surf.hpp @@ -112,7 +112,6 @@ public: virtual double shareResourcesLazy(double now); virtual double shareResourcesFull(double now); double shareResourcesMaxMin(xbt_swag_t running_actions, - size_t offset, lmm_system_t sys, void (*solve) (lmm_system_t)); virtual void updateActionsState(double now, double delta); @@ -232,7 +231,7 @@ public: s_xbt_swag_hookup_t p_stateHookup; e_surf_action_state_t getState(); /**< get the state*/ - void setState(e_surf_action_state_t state); /**< Change state*/ + virtual void setState(e_surf_action_state_t state); /**< Change state*/ double getStartTime(); /**< Return the start time of an action */ double getFinishTime(); /**< Return the finish time of an action */ void setData(void* data); @@ -286,7 +285,6 @@ private: void updateResourceState(void *id, tmgr_trace_event_t event_type, double value, double time); - lmm_system_t p_maxminSystem; xbt_swag_t p_modifiedSet; xbt_heap_t p_actionHeap; int m_selectiveUpdate;