mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-29 10:39:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use C++11 override instead of CM_OVERRIDE

Browse Source 
We now require C++11 support including `override`.  Drop use of
the old compatibility macro.  Convert references as follows:

    git grep -l CM_OVERRIDE -- '*.h' '*.hxx' '*.cxx' |
      xargs sed -i 's/CM_OVERRIDE/override/g'
This commit is contained in:
Brad King
2017-09-15 09:56:26 -04:00
parent c0c5f924fe
commit 0b33aee48b
251 changed files with 1089 additions and 1131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmExportBuildAndroidMKGenerator.h
+12 -13
View File
@@ -42,25 +42,24 @@ public:
protected:
// Implement virtual methods from the superclass.
void GeneratePolicyHeaderCode(std::ostream&) CM_OVERRIDE {}
void GeneratePolicyFooterCode(std::ostream&) CM_OVERRIDE {}
void GeneratePolicyHeaderCode(std::ostream&) override {}
void GeneratePolicyFooterCode(std::ostream&) override {}
void GenerateImportHeaderCode(std::ostream& os,
const std::string& config = "") CM_OVERRIDE;
void GenerateImportFooterCode(std::ostream& os) CM_OVERRIDE;
const std::string& config = "") override;
void GenerateImportFooterCode(std::ostream& os) override;
void GenerateImportTargetCode(std::ostream& os,
const cmGeneratorTarget* target) CM_OVERRIDE;
const cmGeneratorTarget* target) 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;
std::ostream& os, const std::string& expectedTargets) override;
void GenerateImportPropertyCode(
std::ostream& os, const std::string& config,
cmGeneratorTarget const* target,
ImportPropertyMap const& properties) override;
void GenerateMissingTargetsCheckCode(
std::ostream& os,
const std::vector<std::string>& missingTargets) CM_OVERRIDE;
std::ostream& os, const std::vector<std::string>& missingTargets) override;
void GenerateInterfaceProperties(
cmGeneratorTarget const* target, std::ostream& os,
const ImportPropertyMap& properties) CM_OVERRIDE;
const ImportPropertyMap& properties) override;
};
#endif