summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio14Generator.h
diff options
context:
space:
mode:
authorVitaly Stakhovsky <vvs31415@gitlab.org>2017-12-16 02:17:49 (GMT)
committerVitaly Stakhovsky <vvs31415@gitlab.org>2017-12-16 02:17:49 (GMT)
commitcfe4e2db1fd609fea5da355cd61e0b77e185f258 (patch)
treeddc608c1a0a5478220183e12c8abc65fb915f931 /Source/cmGlobalVisualStudio14Generator.h
parentf67f76c2b3a4c50d4116ce806df0c7f861e227dd (diff)
downloadCMake-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/cmGlobalVisualStudio14Generator.h')
-rw-r--r--Source/cmGlobalVisualStudio14Generator.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmGlobalVisualStudio14Generator.h b/Source/cmGlobalVisualStudio14Generator.h
index 425fb22..d92a11a 100644
--- a/Source/cmGlobalVisualStudio14Generator.h
+++ b/Source/cmGlobalVisualStudio14Generator.h
@@ -22,26 +22,26 @@ 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 "14.0"; }
+ const char* GetToolsVersion() override { return "14.0"; }
protected:
- virtual bool InitializeWindows(cmMakefile* mf);
- virtual bool InitializeWindowsStore(cmMakefile* mf);
- virtual bool SelectWindowsStoreToolset(std::string& toolset) const;
+ bool InitializeWindows(cmMakefile* mf) override;
+ bool InitializeWindowsStore(cmMakefile* mf) override;
+ bool SelectWindowsStoreToolset(std::string& toolset) const override;
// These aren't virtual because we need to check if the selected version
// of the toolset is installed
bool IsWindowsStoreToolsetInstalled() const;
- virtual const char* GetIDEVersion() { return "14.0"; }
+ const char* GetIDEVersion() override { return "14.0"; }
virtual bool SelectWindows10SDK(cmMakefile* mf, bool required);
// Used to verify that the Desktop toolset for the current generator is
// installed on the machine.
- virtual bool IsWindowsDesktopToolsetInstalled() const;
+ bool IsWindowsDesktopToolsetInstalled() const override;
std::string GetWindows10SDKVersion();