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/cmGlobalVisualStudio12Generator.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/cmGlobalVisualStudio12Generator.h')
-rw-r--r-- | Source/cmGlobalVisualStudio12Generator.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Source/cmGlobalVisualStudio12Generator.h b/Source/cmGlobalVisualStudio12Generator.h index 5ba21a6..c941809 100644 --- a/Source/cmGlobalVisualStudio12Generator.h +++ b/Source/cmGlobalVisualStudio12Generator.h @@ -22,32 +22,32 @@ 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; // in Visual Studio 2013 they detached the MSBuild tools version // from the .Net Framework version and instead made it have it's own // version number - virtual const char* GetToolsVersion() { return "12.0"; } + const char* GetToolsVersion() override { return "12.0"; } protected: bool ProcessGeneratorToolsetField(std::string const& key, std::string const& value) override; - virtual bool InitializeWindowsPhone(cmMakefile* mf); - virtual bool InitializeWindowsStore(cmMakefile* mf); - virtual bool SelectWindowsPhoneToolset(std::string& toolset) const; - virtual bool SelectWindowsStoreToolset(std::string& toolset) const; + bool InitializeWindowsPhone(cmMakefile* mf) override; + bool InitializeWindowsStore(cmMakefile* mf) override; + bool SelectWindowsPhoneToolset(std::string& toolset) const override; + bool SelectWindowsStoreToolset(std::string& toolset) const override; // 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 bool IsWindowsPhoneToolsetInstalled() const; bool IsWindowsStoreToolsetInstalled() const; - virtual const char* GetIDEVersion() { return "12.0"; } + const char* GetIDEVersion() override { return "12.0"; } private: class Factory; }; |