From 3fda10945132fdd2dc11ea074a96789a4afa86bc Mon Sep 17 00:00:00 2001 From: Daniel Pfeifer Date: Fri, 16 Sep 2016 13:08:14 +0200 Subject: [PATCH] Mark overridden functions with CM_OVERRIDE --- Source/cmExportBuildAndroidMKGenerator.h | 35 ++++++------- Source/cmExportInstallAndroidMKGenerator.h | 55 +++++++++++---------- Source/cmExternalMakefileProjectGenerator.h | 2 +- 3 files changed, 47 insertions(+), 45 deletions(-) diff --git a/Source/cmExportBuildAndroidMKGenerator.h b/Source/cmExportBuildAndroidMKGenerator.h index e26aba061..d15245e6d 100644 --- a/Source/cmExportBuildAndroidMKGenerator.h +++ b/Source/cmExportBuildAndroidMKGenerator.h @@ -45,24 +45,25 @@ public: protected: // Implement virtual methods from the superclass. - virtual void GeneratePolicyHeaderCode(std::ostream&) {} - virtual void GeneratePolicyFooterCode(std::ostream&) {} - virtual void GenerateImportHeaderCode(std::ostream& os, - const std::string& config = ""); - virtual void GenerateImportFooterCode(std::ostream& os); - virtual void GenerateImportTargetCode(std::ostream& os, - const cmGeneratorTarget* target); - virtual void GenerateExpectedTargetsCode(std::ostream& os, - const std::string& expectedTargets); - virtual void GenerateImportPropertyCode(std::ostream& os, - const std::string& config, - cmGeneratorTarget const* target, - ImportPropertyMap const& properties); - virtual void GenerateMissingTargetsCheckCode( - std::ostream& os, const std::vector& missingTargets); - virtual void GenerateInterfaceProperties( + void GeneratePolicyHeaderCode(std::ostream&) CM_OVERRIDE {} + void GeneratePolicyFooterCode(std::ostream&) CM_OVERRIDE {} + void GenerateImportHeaderCode(std::ostream& os, + const std::string& config = "") CM_OVERRIDE; + void GenerateImportFooterCode(std::ostream& os) CM_OVERRIDE; + void GenerateImportTargetCode(std::ostream& os, + const cmGeneratorTarget* target) CM_OVERRIDE; + void GenerateExpectedTargetsCode( + std::ostream& os, const std::string& expectedTargets) CM_OVERRIDE; + void GenerateImportPropertyCode(std::ostream& os, const std::string& config, + cmGeneratorTarget const* target, + ImportPropertyMap const& properties) + CM_OVERRIDE; + void GenerateMissingTargetsCheckCode( + std::ostream& os, + const std::vector& missingTargets) CM_OVERRIDE; + void GenerateInterfaceProperties( cmGeneratorTarget const* target, std::ostream& os, - const ImportPropertyMap& properties); + const ImportPropertyMap& properties) CM_OVERRIDE; }; #endif diff --git a/Source/cmExportInstallAndroidMKGenerator.h b/Source/cmExportInstallAndroidMKGenerator.h index 4b9f51c17..ccfe6f899 100644 --- a/Source/cmExportInstallAndroidMKGenerator.h +++ b/Source/cmExportInstallAndroidMKGenerator.h @@ -37,36 +37,37 @@ public: protected: // Implement virtual methods from the superclass. - virtual void GeneratePolicyHeaderCode(std::ostream&) {} - virtual void GeneratePolicyFooterCode(std::ostream&) {} - virtual void GenerateImportHeaderCode(std::ostream& os, - const std::string& config = ""); - virtual void GenerateImportFooterCode(std::ostream& os); - virtual void GenerateImportTargetCode(std::ostream& os, - const cmGeneratorTarget* target); - virtual void GenerateExpectedTargetsCode(std::ostream& os, - const std::string& expectedTargets); - virtual void GenerateImportPropertyCode(std::ostream& os, - const std::string& config, - cmGeneratorTarget const* target, - ImportPropertyMap const& properties); - virtual void GenerateMissingTargetsCheckCode( - std::ostream& os, const std::vector& missingTargets); - virtual void GenerateInterfaceProperties( + void GeneratePolicyHeaderCode(std::ostream&) CM_OVERRIDE {} + void GeneratePolicyFooterCode(std::ostream&) CM_OVERRIDE {} + void GenerateImportHeaderCode(std::ostream& os, + const std::string& config = "") CM_OVERRIDE; + void GenerateImportFooterCode(std::ostream& os) CM_OVERRIDE; + void GenerateImportTargetCode(std::ostream& os, + const cmGeneratorTarget* target) CM_OVERRIDE; + void GenerateExpectedTargetsCode( + std::ostream& os, const std::string& expectedTargets) CM_OVERRIDE; + void GenerateImportPropertyCode(std::ostream& os, const std::string& config, + cmGeneratorTarget const* target, + ImportPropertyMap const& properties) + CM_OVERRIDE; + void GenerateMissingTargetsCheckCode( + std::ostream& os, + const std::vector& missingTargets) CM_OVERRIDE; + void GenerateInterfaceProperties( cmGeneratorTarget const* target, std::ostream& os, - const ImportPropertyMap& properties); - virtual void GenerateImportPrefix(std::ostream& os); - virtual void LoadConfigFiles(std::ostream&); - virtual void GenerateRequiredCMakeVersion(std::ostream& os, - const char* versionString); - virtual void CleanupTemporaryVariables(std::ostream&); - virtual void GenerateImportedFileCheckLoop(std::ostream& os); - virtual void GenerateImportedFileChecksCode( + const ImportPropertyMap& properties) CM_OVERRIDE; + void GenerateImportPrefix(std::ostream& os) CM_OVERRIDE; + void LoadConfigFiles(std::ostream&) CM_OVERRIDE; + void GenerateRequiredCMakeVersion(std::ostream& os, + const char* versionString) CM_OVERRIDE; + void CleanupTemporaryVariables(std::ostream&) CM_OVERRIDE; + void GenerateImportedFileCheckLoop(std::ostream& os) CM_OVERRIDE; + void GenerateImportedFileChecksCode( std::ostream& os, cmGeneratorTarget* target, ImportPropertyMap const& properties, - const std::set& importedLocations); - virtual bool GenerateImportFileConfig(const std::string& config, - std::vector&); + const std::set& importedLocations) CM_OVERRIDE; + bool GenerateImportFileConfig(const std::string& config, + std::vector&) CM_OVERRIDE; }; #endif diff --git a/Source/cmExternalMakefileProjectGenerator.h b/Source/cmExternalMakefileProjectGenerator.h index b306f191f..aa614fc03 100644 --- a/Source/cmExternalMakefileProjectGenerator.h +++ b/Source/cmExternalMakefileProjectGenerator.h @@ -108,7 +108,7 @@ public: } cmExternalMakefileProjectGenerator* CreateExternalMakefileProjectGenerator() - const + const CM_OVERRIDE { T* p = new T; p->SetName(GetName());