kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mark overridden functions with CM_OVERRIDE

This commit is contained in:
Daniel Pfeifer 2016-09-16 13:08:14 +02:00
parent 00fd64d126
commit 3fda109451
3 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Source/cmExportBuildAndroidMKGenerator.h
View File

@ -45,24 +45,25 @@ public:
protected: protected:
// Implement virtual methods from the superclass. // Implement virtual methods from the superclass.
virtual void GeneratePolicyHeaderCode(std::ostream&) {} void GeneratePolicyHeaderCode(std::ostream&) CM_OVERRIDE {}
virtual void GeneratePolicyFooterCode(std::ostream&) {} void GeneratePolicyFooterCode(std::ostream&) CM_OVERRIDE {}
virtual void GenerateImportHeaderCode(std::ostream& os, void GenerateImportHeaderCode(std::ostream& os,
const std::string& config = ""); const std::string& config = "") CM_OVERRIDE;
virtual void GenerateImportFooterCode(std::ostream& os); void GenerateImportFooterCode(std::ostream& os) CM_OVERRIDE;
virtual void GenerateImportTargetCode(std::ostream& os, void GenerateImportTargetCode(std::ostream& os,
const cmGeneratorTarget* target); const cmGeneratorTarget* target) CM_OVERRIDE;
virtual void GenerateExpectedTargetsCode(std::ostream& os, void GenerateExpectedTargetsCode(
const std::string& expectedTargets); std::ostream& os, const std::string& expectedTargets) CM_OVERRIDE;
virtual void GenerateImportPropertyCode(std::ostream& os, void GenerateImportPropertyCode(std::ostream& os, const std::string& config,
const std::string& config, cmGeneratorTarget const* target,
cmGeneratorTarget const* target, ImportPropertyMap const& properties)
ImportPropertyMap const& properties); CM_OVERRIDE;
virtual void GenerateMissingTargetsCheckCode( void GenerateMissingTargetsCheckCode(
std::ostream& os, const std::vector<std::string>& missingTargets); std::ostream& os,
virtual void GenerateInterfaceProperties( const std::vector<std::string>& missingTargets) CM_OVERRIDE;
void GenerateInterfaceProperties(
cmGeneratorTarget const* target, std::ostream& os, cmGeneratorTarget const* target, std::ostream& os,
const ImportPropertyMap& properties); const ImportPropertyMap& properties) CM_OVERRIDE;
}; };
#endif #endif

55
Source/cmExportInstallAndroidMKGenerator.h
View File

@ -37,36 +37,37 @@ public:
protected: protected:
// Implement virtual methods from the superclass. // Implement virtual methods from the superclass.
virtual void GeneratePolicyHeaderCode(std::ostream&) {} void GeneratePolicyHeaderCode(std::ostream&) CM_OVERRIDE {}
virtual void GeneratePolicyFooterCode(std::ostream&) {} void GeneratePolicyFooterCode(std::ostream&) CM_OVERRIDE {}
virtual void GenerateImportHeaderCode(std::ostream& os, void GenerateImportHeaderCode(std::ostream& os,
const std::string& config = ""); const std::string& config = "") CM_OVERRIDE;
virtual void GenerateImportFooterCode(std::ostream& os); void GenerateImportFooterCode(std::ostream& os) CM_OVERRIDE;
virtual void GenerateImportTargetCode(std::ostream& os, void GenerateImportTargetCode(std::ostream& os,
const cmGeneratorTarget* target); const cmGeneratorTarget* target) CM_OVERRIDE;
virtual void GenerateExpectedTargetsCode(std::ostream& os, void GenerateExpectedTargetsCode(
const std::string& expectedTargets); std::ostream& os, const std::string& expectedTargets) CM_OVERRIDE;
virtual void GenerateImportPropertyCode(std::ostream& os, void GenerateImportPropertyCode(std::ostream& os, const std::string& config,
const std::string& config, cmGeneratorTarget const* target,
cmGeneratorTarget const* target, ImportPropertyMap const& properties)
ImportPropertyMap const& properties); CM_OVERRIDE;
virtual void GenerateMissingTargetsCheckCode( void GenerateMissingTargetsCheckCode(
std::ostream& os, const std::vector<std::string>& missingTargets); std::ostream& os,
virtual void GenerateInterfaceProperties( const std::vector<std::string>& missingTargets) CM_OVERRIDE;
void GenerateInterfaceProperties(
cmGeneratorTarget const* target, std::ostream& os, cmGeneratorTarget const* target, std::ostream& os,
const ImportPropertyMap& properties); const ImportPropertyMap& properties) CM_OVERRIDE;
virtual void GenerateImportPrefix(std::ostream& os); void GenerateImportPrefix(std::ostream& os) CM_OVERRIDE;
virtual void LoadConfigFiles(std::ostream&); void LoadConfigFiles(std::ostream&) CM_OVERRIDE;
virtual void GenerateRequiredCMakeVersion(std::ostream& os, void GenerateRequiredCMakeVersion(std::ostream& os,
const char* versionString); const char* versionString) CM_OVERRIDE;
virtual void CleanupTemporaryVariables(std::ostream&); void CleanupTemporaryVariables(std::ostream&) CM_OVERRIDE;
virtual void GenerateImportedFileCheckLoop(std::ostream& os); void GenerateImportedFileCheckLoop(std::ostream& os) CM_OVERRIDE;
virtual void GenerateImportedFileChecksCode( void GenerateImportedFileChecksCode(
std::ostream& os, cmGeneratorTarget* target, std::ostream& os, cmGeneratorTarget* target,
ImportPropertyMap const& properties, ImportPropertyMap const& properties,
const std::set<std::string>& importedLocations); const std::set<std::string>& importedLocations) CM_OVERRIDE;
virtual bool GenerateImportFileConfig(const std::string& config, bool GenerateImportFileConfig(const std::string& config,
std::vector<std::string>&); std::vector<std::string>&) CM_OVERRIDE;
}; };
#endif #endif

2
Source/cmExternalMakefileProjectGenerator.h
View File

@ -108,7 +108,7 @@ public:
} }
cmExternalMakefileProjectGenerator* CreateExternalMakefileProjectGenerator() cmExternalMakefileProjectGenerator* CreateExternalMakefileProjectGenerator()
const const CM_OVERRIDE
{ {
T* p = new T; T* p = new T;
p->SetName(GetName()); p->SetName(GetName());