Use C++11 override instead of CM_OVERRIDE

We now require C++11 support including `override`.  Drop use of
the old compatibility macro.  Convert references as follows:

    git grep -l CM_OVERRIDE -- '*.h' '*.hxx' '*.cxx' |
      xargs sed -i 's/CM_OVERRIDE/override/g'
This commit is contained in:
Brad King
2017-09-15 09:56:26 -04:00
parent c0c5f924fe
commit 0b33aee48b
251 changed files with 1089 additions and 1131 deletions
+8 -8
View File
@@ -103,8 +103,8 @@ private:
unsigned int DataStart;
const char* Ignore;
cmCAStringVector();
bool DoConsume(const std::string& arg, unsigned int index) CM_OVERRIDE;
void DoReset() CM_OVERRIDE;
bool DoConsume(const std::string& arg, unsigned int index) override;
void DoReset() override;
};
/** cmCAString is to be used for arguments which consist of one value,
@@ -121,8 +121,8 @@ public:
private:
std::string String;
unsigned int DataStart;
bool DoConsume(const std::string& arg, unsigned int index) CM_OVERRIDE;
void DoReset() CM_OVERRIDE;
bool DoConsume(const std::string& arg, unsigned int index) override;
void DoReset() override;
cmCAString();
};
@@ -138,8 +138,8 @@ public:
bool IsEnabled() const { return this->Enabled; }
private:
bool Enabled;
bool DoConsume(const std::string& arg, unsigned int index) CM_OVERRIDE;
void DoReset() CM_OVERRIDE;
bool DoConsume(const std::string& arg, unsigned int index) override;
void DoReset() override;
cmCAEnabler();
};
@@ -155,8 +155,8 @@ public:
bool IsEnabled() const { return this->Enabled; }
private:
bool Enabled;
bool DoConsume(const std::string& arg, unsigned int index) CM_OVERRIDE;
void DoReset() CM_OVERRIDE;
bool DoConsume(const std::string& arg, unsigned int index) override;
void DoReset() override;
cmCADisabler();
};