echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some occurrences of missing override keywords

Browse Source 
Fix issues diagnosed by clang-tidy [modernize-use-override].

These occurrences are only showing up on OSX.

Signed-off-by: Matthias Maennich <matthias@maennich.net>
This commit is contained in:
Matthias Maennich 2017-09-19 16:00:21 +02:00 committed by Brad King
parent b128f8c5bc
commit a45928cdeb
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmGlobalXCodeGenerator.cxx
View File

@ -47,8 +47,11 @@ public:
: Version("1.5") : Version("1.5")
{ {
} }
void StartElement(const std::string&, const char**) { this->Data = ""; } void StartElement(const std::string&, const char**) override
void EndElement(const std::string& name) {
this->Data = "";
}
void EndElement(const std::string& name) override
{ {
if (name == "key") { if (name == "key") {
this->Key = this->Data; this->Key = this->Data;
@ -58,7 +61,7 @@ public:
} }
} }
} }
void CharacterDataHandler(const char* data, int length) void CharacterDataHandler(const char* data, int length) override
{ {
this->Data.append(data, length); this->Data.append(data, length);
} }

16
Source/cmLocalXCodeGenerator.h
View File

@ -27,16 +27,16 @@ public:
///! Set cache only and recurse to false by default. ///! Set cache only and recurse to false by default.
cmLocalXCodeGenerator(cmGlobalGenerator* gg, cmMakefile* mf); cmLocalXCodeGenerator(cmGlobalGenerator* gg, cmMakefile* mf);
virtual ~cmLocalXCodeGenerator(); ~cmLocalXCodeGenerator() override;
virtual std::string GetTargetDirectory( std::string GetTargetDirectory(
cmGeneratorTarget const* target) const; cmGeneratorTarget const* target) const override;
virtual void AppendFlagEscape(std::string& flags, void AppendFlagEscape(std::string& flags,
const std::string& rawFlag); const std::string& rawFlag) override;
virtual void Generate(); void Generate() override;
virtual void GenerateInstallRules(); virtual void GenerateInstallRules();
virtual void ComputeObjectFilenames( void ComputeObjectFilenames(
std::map<cmSourceFile const*, std::string>& mapping, std::map<cmSourceFile const*, std::string>& mapping,
cmGeneratorTarget const* gt = nullptr); cmGeneratorTarget const* gt = nullptr) override;
private: private:
}; };

2
Source/cmMachO.cxx
View File

@ -134,7 +134,7 @@ public:
: cmMachOHeaderAndLoadCommands(_swap) : cmMachOHeaderAndLoadCommands(_swap)
{ {
} }
bool read_mach_o(cmsys::ifstream& fin) bool read_mach_o(cmsys::ifstream& fin) override
{ {
if (!read(fin, this->Header)) { if (!read(fin, this->Header)) {
return false; return false;

2
Source/cmXCode21Object.h
View File

@ -14,7 +14,7 @@ class cmXCode21Object : public cmXCodeObject
{ {
public: public:
cmXCode21Object(PBXType ptype, Type type); cmXCode21Object(PBXType ptype, Type type);
virtual void PrintComment(std::ostream&); void PrintComment(std::ostream&) override;
static void PrintList(std::vector<cmXCodeObject*> const&, std::ostream& out, static void PrintList(std::vector<cmXCodeObject*> const&, std::ostream& out,
PBXType t); PBXType t);
static void PrintList(std::vector<cmXCodeObject*> const&, std::ostream& out); static void PrintList(std::vector<cmXCodeObject*> const&, std::ostream& out);