[mc] Use the real override

diff --git a/src/mc/mc_forward.hpp b/src/mc/mc_forward.hpp
index 551bee4..e0e7eb1 100644 (file)
--- a/src/mc/mc_forward.hpp
+++ b/src/mc/mc_forward.hpp
@@ -12,16 +12,6 @@
 #ifndef SIMGRID_MC_FORWARD_HPP
 #define SIMGRID_MC_FORWARD_HPP
 
-#ifndef __has_feature
-  #define MC_OVERRIDE
-#else
-  #if __has_feature(cxx_override_control)
-    #define MC_OVERRIDE override
-  #else
-    #define MC_OVERRIDE
-  #endif
-#endif
-
 namespace simgrid {
 namespace mc {
 

diff --git a/src/mc/mc_process.h b/src/mc/mc_process.h
index 8aee3c0..81002ab 100644 (file)
--- a/src/mc/mc_process.h
+++ b/src/mc/mc_process.h
@@ -72,7 +72,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 MC_OVERRIDE;
+    ReadMode mode = Normal) const 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 418278d..00a36e4 100644 (file)
--- a/src/mc/mc_snapshot.h
+++ b/src/mc/mc_snapshot.h
@@ -145,7 +145,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 MC_OVERRIDE;
+    ReadMode mode = Normal) const override;
 public: // To be private
   simgrid::mc::Process* process;
   int num_state;