From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Fri, 22 May 2015 13:53:35 +0000 (+0200)
Subject: [mc] Replace the override word with MC_OVERRIDE
X-Git-Tag: v3_12~717
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2b7bf2ece143fd83bafa635a83940f58083e7f18?hp=5a7a6f80e22273d21c1d2ab0847a0438cb832b92

[mc] Replace the override word with MC_OVERRIDE

The compilers used by the CI infratrsucture do not handle this. In the
future, we might detect if the compiler grokes it and we might
conditionnaly use:
---

diff --git a/src/mc/mc_forward.h b/src/mc/mc_forward.h
index 2abc34a28e..725382bf7a 100644
--- a/src/mc/mc_forward.h
+++ b/src/mc/mc_forward.h
@@ -12,6 +12,8 @@
 
 #ifdef __cplusplus
 
+#define MC_OVERRIDE
+
 namespace simgrid {
 namespace mc {
 
diff --git a/src/mc/mc_process.h b/src/mc/mc_process.h
index d26ca5b2c4..00251e4eb5 100644
--- a/src/mc/mc_process.h
+++ b/src/mc/mc_process.h
@@ -69,7 +69,7 @@ public:
   // Read memory:
   const void* read_bytes(void* buffer, std::size_t size,
     remote_ptr<void> address, int process_index = ProcessIndexAny,
-    ReadMode mode = Normal) const override;
+    ReadMode mode = Normal) const MC_OVERRIDE;
   void read_variable(const char* name, void* target, size_t size) const;
   template<class T>
   T read_variable(const char *name) const
diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h
index c285ead4a0..e56fee0020 100644
--- a/src/mc/mc_snapshot.h
+++ b/src/mc/mc_snapshot.h
@@ -210,7 +210,7 @@ public:
   ~Snapshot();
   const void* read_bytes(void* buffer, std::size_t size,
     remote_ptr<void> address, int process_index = ProcessIndexAny,
-    ReadMode mode = Normal) const override;
+    ReadMode mode = Normal) const MC_OVERRIDE;
 public: // To be private
   mc_process_t process;
   int num_state;