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/cmGlobalNMakeMakefileGenerator.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/cmGlobalNMakeMakefileGenerator.h')
| -rw-r--r-- | Source/cmGlobalNMakeMakefileGenerator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalNMakeMakefileGenerator.h b/Source/cmGlobalNMakeMakefileGenerator.h index 6eb2124..05ab904 100644 --- a/Source/cmGlobalNMakeMakefileGenerator.h +++ b/Source/cmGlobalNMakeMakefileGenerator.h @@ -27,7 +27,7 @@ public: static std::string GetActualName() { return "NMake Makefiles"; } /** Get encoding used by generator for makefile files */ - codecvt::Encoding GetMakefileEncoding() const CM_OVERRIDE + codecvt::Encoding GetMakefileEncoding() const override { return codecvt::ANSI; } |