diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-15 13:56:26 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-09-15 14:06:41 (GMT) |
| commit | 0b33aee48b1f4027fe6086b5610434a5f29b0b8a (patch) | |
| tree | e2fc28dc511f61de6af3cbc550efdad03bfb9204 /Source/cmGlobalWatcomWMakeGenerator.h | |
| parent | c0c5f924fe46fcf83603117689b372cb8520c4bb (diff) | |
| download | CMake-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/cmGlobalWatcomWMakeGenerator.h')
| -rw-r--r-- | Source/cmGlobalWatcomWMakeGenerator.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmGlobalWatcomWMakeGenerator.h b/Source/cmGlobalWatcomWMakeGenerator.h index bd09715..e8b3a73 100644 --- a/Source/cmGlobalWatcomWMakeGenerator.h +++ b/Source/cmGlobalWatcomWMakeGenerator.h @@ -29,7 +29,7 @@ public: return new cmGlobalGeneratorSimpleFactory<cmGlobalWatcomWMakeGenerator>(); } ///! Get the name for the generator. - std::string GetName() const CM_OVERRIDE + std::string GetName() const override { return cmGlobalWatcomWMakeGenerator::GetActualName(); } @@ -43,10 +43,10 @@ public: * extension, pthreads, byte order etc. */ void EnableLanguage(std::vector<std::string> const& languages, cmMakefile*, - bool optional) CM_OVERRIDE; + bool optional) override; - bool AllowNotParallel() const CM_OVERRIDE { return false; } - bool AllowDeleteOnError() const CM_OVERRIDE { return false; } + bool AllowNotParallel() const override { return false; } + bool AllowDeleteOnError() const override { return false; } }; #endif |