From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Sat, 4 Nov 2017 00:07:39 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3.18~305
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5a5f54e7f74566a2418d243e7885e737c2312a36?hp=403af5e6247ce6452b721f418a5b41e4548efac4

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 991cf38c9b..d899ed0c98 100644
--- 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 4bdbe144ed..ebf4a4aca7 100644
--- 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;