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/CPack/cmCPackNSISGenerator.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/CPack/cmCPackNSISGenerator.h')
-rw-r--r-- | Source/CPack/cmCPackNSISGenerator.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Source/CPack/cmCPackNSISGenerator.h b/Source/CPack/cmCPackNSISGenerator.h index bdd1955..fc9ad9a 100644 --- a/Source/CPack/cmCPackNSISGenerator.h +++ b/Source/CPack/cmCPackNSISGenerator.h @@ -34,22 +34,22 @@ public: * Construct generator */ cmCPackNSISGenerator(bool nsis64 = false); - ~cmCPackNSISGenerator() CM_OVERRIDE; + ~cmCPackNSISGenerator() override; protected: - int InitializeInternal() CM_OVERRIDE; + int InitializeInternal() override; void CreateMenuLinks(std::ostream& str, std::ostream& deleteStr); - int PackageFiles() CM_OVERRIDE; - const char* GetOutputExtension() CM_OVERRIDE { return ".exe"; } - const char* GetOutputPostfix() CM_OVERRIDE { return "win32"; } + int PackageFiles() override; + const char* GetOutputExtension() override { return ".exe"; } + const char* GetOutputPostfix() override { return "win32"; } bool GetListOfSubdirectories(const char* dir, std::vector<std::string>& dirs); - enum cmCPackGenerator::CPackSetDestdirSupport SupportsSetDestdir() const - CM_OVERRIDE; - bool SupportsAbsoluteDestination() const CM_OVERRIDE; - bool SupportsComponentInstallation() const CM_OVERRIDE; + enum cmCPackGenerator::CPackSetDestdirSupport SupportsSetDestdir() + const override; + bool SupportsAbsoluteDestination() const override; + bool SupportsComponentInstallation() const override; /// Produce a string that contains the NSIS code to describe a /// particular component. Any added macros will be emitted via |