From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Fri, 13 May 2016 21:43:17 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_14~1235
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/bc766ca24e52409c0cff6ddec6b8f4b49bf7d159?hp=147baad3c85745bba0138d0b4ba105e94d4ee91f

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

diff --git a/src/simix/SynchroIo.hpp b/src/simix/SynchroIo.hpp
index afe6041cd9..53dcbdf043 100644
--- a/src/simix/SynchroIo.hpp
+++ b/src/simix/SynchroIo.hpp
@@ -14,8 +14,8 @@ namespace simix {
 
   XBT_PUBLIC_CLASS Io : public Synchro {
   public:
-    void suspend();
-    void resume();
+    void suspend() override;
+    void resume() override;
     void post() override;
 
     sg_host_t host;