diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-06 13:36:10 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-03-06 13:36:17 (GMT) |
| commit | fb744ed49c613c1cb83f67af1c98bb2eba69b132 (patch) | |
| tree | 62b9342e8313a15ebd1d053b0dbe7b05e7980277 | |
| parent | d564d0619496612ea174d221a643fba8d1f62538 (diff) | |
| parent | c9d2e1cee07a9b93d9584768ce5610af70b7d44d (diff) | |
| download | CMake-fb744ed49c613c1cb83f67af1c98bb2eba69b132.zip CMake-fb744ed49c613c1cb83f67af1c98bb2eba69b132.tar.gz CMake-fb744ed49c613c1cb83f67af1c98bb2eba69b132.tar.bz2 | |
Merge topic 'fix-override'
c9d2e1cee0 Fix missing `override`
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3061
| -rw-r--r-- | Source/cmGlobalVisualStudioVersionedGenerator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmLocalGhsMultiGenerator.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.cxx b/Source/cmGlobalVisualStudioVersionedGenerator.cxx index 2f9eb3f..94f6b68 100644 --- a/Source/cmGlobalVisualStudioVersionedGenerator.cxx +++ b/Source/cmGlobalVisualStudioVersionedGenerator.cxx @@ -206,8 +206,8 @@ class cmGlobalVisualStudioVersionedGenerator::Factory16 : public cmGlobalGeneratorFactory { public: - virtual cmGlobalGenerator* CreateGlobalGenerator(const std::string& name, - cmake* cm) const + cmGlobalGenerator* CreateGlobalGenerator(const std::string& name, + cmake* cm) const override { std::string genName; const char* p = cmVS16GenName(name, genName); @@ -221,7 +221,7 @@ public: return 0; } - virtual void GetDocumentation(cmDocumentationEntry& entry) const + void GetDocumentation(cmDocumentationEntry& entry) const override { entry.Name = std::string(vs16generatorName); entry.Brief = "Generates Visual Studio 2019 project files. " diff --git a/Source/cmLocalGhsMultiGenerator.h b/Source/cmLocalGhsMultiGenerator.h index d5bec42..2584fd3 100644 --- a/Source/cmLocalGhsMultiGenerator.h +++ b/Source/cmLocalGhsMultiGenerator.h @@ -23,7 +23,7 @@ public: /** * Generate the makefile for this directory. */ - virtual void Generate(); + void Generate() override; std::string GetTargetDirectory( cmGeneratorTarget const* target) const override; |