summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefileTargetGenerator.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-09-15 13:56:26 (GMT)
committerBrad King <brad.king@kitware.com>2017-09-15 14:06:41 (GMT)
commit0b33aee48b1f4027fe6086b5610434a5f29b0b8a (patch)
treee2fc28dc511f61de6af3cbc550efdad03bfb9204 /Source/cmMakefileTargetGenerator.h
parentc0c5f924fe46fcf83603117689b372cb8520c4bb (diff)
downloadCMake-0b33aee48b1f4027fe6086b5610434a5f29b0b8a.zip
CMake-0b33aee48b1f4027fe6086b5610434a5f29b0b8a.tar.gz
CMake-0b33aee48b1f4027fe6086b5610434a5f29b0b8a.tar.bz2
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'
Diffstat (limited to 'Source/cmMakefileTargetGenerator.h')
-rw-r--r--Source/cmMakefileTargetGenerator.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/cmMakefileTargetGenerator.h b/Source/cmMakefileTargetGenerator.h
index e0e9580..5ab7e36 100644
--- a/Source/cmMakefileTargetGenerator.h
+++ b/Source/cmMakefileTargetGenerator.h
@@ -33,7 +33,7 @@ class cmMakefileTargetGenerator : public cmCommonTargetGenerator
public:
// constructor to set the ivars
cmMakefileTargetGenerator(cmGeneratorTarget* target);
- ~cmMakefileTargetGenerator() CM_OVERRIDE;
+ ~cmMakefileTargetGenerator() override;
// construct using this factory call
static cmMakefileTargetGenerator* New(cmGeneratorTarget* tgt);
@@ -81,8 +81,7 @@ protected:
{
}
- void operator()(cmSourceFile const& source,
- const char* pkgloc) CM_OVERRIDE;
+ void operator()(cmSourceFile const& source, const char* pkgloc) override;
private:
cmMakefileTargetGenerator* Generator;
@@ -168,8 +167,7 @@ protected:
/** Add commands for generate def files */
void GenDefFile(std::vector<std::string>& real_link_commands);
- void AddIncludeFlags(std::string& flags,
- const std::string& lang) CM_OVERRIDE;
+ void AddIncludeFlags(std::string& flags, const std::string& lang) override;
virtual void CloseFileStreams();
cmLocalUnixMakefileGenerator3* LocalGenerator;