don't make a pure function an object member

diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index 1700180..5294f60 100644 (file)
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -84,7 +84,7 @@ Cpu *CpuCas01Model::createCpu(simgrid::s4u::Host *host, std::vector<double> *spe
 
 double CpuCas01Model::next_occuring_event_full(double /*now*/)
 {
-  return Model::shareResourcesMaxMin(getRunningActionSet(), maxminSystem_, lmm_solve);
+  return shareResourcesMaxMin(getRunningActionSet(), maxminSystem_, lmm_solve);
 }
 
 /************

diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp
index be3dcaf..82a7e71 100644 (file)
--- a/src/surf/ptask_L07.cpp
+++ b/src/surf/ptask_L07.cpp
@@ -76,10 +76,10 @@ double HostL07Model::next_occuring_event(double /*now*/)
   L07Action *action;
 
   ActionList *running_actions = getRunningActionSet();
-  double min = this->shareResourcesMaxMin(running_actions, maxminSystem_, bottleneck_solve);
+  double min = shareResourcesMaxMin(running_actions, maxminSystem_, bottleneck_solve);
 
   for(ActionList::iterator it(running_actions->begin()), itend(running_actions->end()); it != itend ; ++it) {
-  action = static_cast<L07Action*>(&*it);
+    action = static_cast<L07Action*>(&*it);
     if (action->m_latency > 0) {
       if (min < 0) {
         min = action->m_latency;

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 619535f..798c991 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -476,9 +476,7 @@ double Model::next_occuring_event_full(double /*now*/) {
   return 0.0;
 }
 
-double Model::shareResourcesMaxMin(ActionList *runningActions,
-                          lmm_system_t sys,
-                          void (*solve) (lmm_system_t))
+double shareResourcesMaxMin(ActionList *runningActions, lmm_system_t sys, void (*solve) (lmm_system_t))
 {
   solve(sys);
 

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index b0d4d98..c397b6b 100644 (file)
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -277,6 +277,13 @@ typedef boost::intrusive::member_hook<
 typedef boost::intrusive::list<Action, ActionLmmOptions> ActionLmmList;
 typedef ActionLmmList* ActionLmmListPtr;
 
+/********************
+ * Helper functions *
+ ********************/
+
+double shareResourcesMaxMin(ActionList* runningActions, lmm_system_t sys, void (*solve) (lmm_system_t));
+
+
 /*********
  * Model *
  *********/
@@ -326,8 +333,6 @@ public:
   virtual double next_occuring_event(double now);
   virtual double next_occuring_event_lazy(double now);
   virtual double next_occuring_event_full(double now);
-  double shareResourcesMaxMin(ActionList* running_actions,
-      lmm_system_t sys, void (*solve) (lmm_system_t));
 
   /**
    * @brief Update action to the current time