Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp
index 991cf38..d899ed0 100644 (file)
--- a/src/surf/cpu_ti.cpp
+++ b/src/surf/cpu_ti.cpp
@@ -668,11 +668,6 @@ CpuTiAction::CpuTiAction(CpuTiModel *model_, double cost, bool failed, CpuTi *cp
   cpu_->modified(true);
 }
 
-void CpuTiAction::updateIndexHeap(int i)
-{
-  Action::updateIndexHeap(i);
-}
-
 void CpuTiAction::setState(Action::State state)
 {
   CpuAction::setState(state);

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index 4bdbe14..ebf4a4a 100644 (file)
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -88,7 +88,6 @@ public:
   void setState(simgrid::surf::Action::State state) override;
   int unref() override;
   void cancel() override;
-  void updateIndexHeap(int i) override;
   void suspend() override;
   void resume() override;
   void setMaxDuration(double duration) override;