diff options
author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2017-12-16 02:17:49 (GMT) |
---|---|---|
committer | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2017-12-16 02:17:49 (GMT) |
commit | cfe4e2db1fd609fea5da355cd61e0b77e185f258 (patch) | |
tree | ddc608c1a0a5478220183e12c8abc65fb915f931 /Source/cmGlobalVisualStudio15Generator.h | |
parent | f67f76c2b3a4c50d4116ce806df0c7f861e227dd (diff) | |
download | CMake-cfe4e2db1fd609fea5da355cd61e0b77e185f258.zip CMake-cfe4e2db1fd609fea5da355cd61e0b77e185f258.tar.gz CMake-cfe4e2db1fd609fea5da355cd61e0b77e185f258.tar.bz2 |
VS: Use 'override' keyword for overridden methods in generator classes
The corresponding 'virtual' removed.
Diffstat (limited to 'Source/cmGlobalVisualStudio15Generator.h')
-rw-r--r-- | Source/cmGlobalVisualStudio15Generator.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmGlobalVisualStudio15Generator.h b/Source/cmGlobalVisualStudio15Generator.h index 852a4e7..4f4e0b9 100644 --- a/Source/cmGlobalVisualStudio15Generator.h +++ b/Source/cmGlobalVisualStudio15Generator.h @@ -22,11 +22,11 @@ public: const std::string& platformName); static cmGlobalGeneratorFactory* NewFactory(); - virtual bool MatchesGeneratorName(const std::string& name) const; + bool MatchesGeneratorName(const std::string& name) const override; - virtual void WriteSLNHeader(std::ostream& fout); + void WriteSLNHeader(std::ostream& fout) override; - virtual const char* GetToolsVersion() { return "15.0"; } + const char* GetToolsVersion() override { return "15.0"; } bool SetGeneratorInstance(std::string const& i, cmMakefile* mf) override; @@ -34,13 +34,13 @@ public: protected: bool InitializeWindows(cmMakefile* mf) override; - virtual bool SelectWindowsStoreToolset(std::string& toolset) const; + bool SelectWindowsStoreToolset(std::string& toolset) const override; - virtual const char* GetIDEVersion() { return "15.0"; } + const char* GetIDEVersion() override { return "15.0"; } // Used to verify that the Desktop toolset for the current generator is // installed on the machine. - virtual bool IsWindowsDesktopToolsetInstalled() const; + bool IsWindowsDesktopToolsetInstalled() const override; // These aren't virtual because we need to check if the selected version // of the toolset is installed |