Merge topic 'cxx11-override'

98530d3c cm_codecvt: Tell IWYU to keep cmConfigure.h
4e14498f Drop now-unused definition of CM_OVERRIDE
0b33aee4 Use C++11 override instead of CM_OVERRIDE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1265

1 files changed, 5 insertions, 8 deletions

diff --git a/Source/cmDisallowedCommand.h b/Source/cmDisallowedCommand.h
index d5bb79a..d85c00f 100644
--- a/Source/cmDisallowedCommand.h
+++ b/Source/cmDisallowedCommand.h
@@ -24,23 +24,20 @@ public:
   {
   }
 
-  ~cmDisallowedCommand() CM_OVERRIDE { delete this->Command; }
+  ~cmDisallowedCommand() override { delete this->Command; }
 
-  cmCommand* Clone() CM_OVERRIDE
+  cmCommand* Clone() override
   {
     return new cmDisallowedCommand(this->Command->Clone(), this->Policy,
                                    this->Message);
   }
 
   bool InitialPass(std::vector<std::string> const& args,
-                   cmExecutionStatus& status) CM_OVERRIDE;
+                   cmExecutionStatus& status) override;
 
-  void FinalPass() CM_OVERRIDE { this->Command->FinalPass(); }
+  void FinalPass() override { this->Command->FinalPass(); }
 
-  bool HasFinalPass() const CM_OVERRIDE
-  {
-    return this->Command->HasFinalPass();
-  }
+  bool HasFinalPass() const override { return this->Command->HasFinalPass(); }
 
 private:
   cmCommand* Command;