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

cmGlobalGeneratorFactory: Use CM_OVERRIDE for all derived classes

This commit is contained in:
Tobias Hunger 2016-07-01 10:11:17 +02:00 committed by Brad King
parent af0e1cd4cb
commit 43a68a6dca
7 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmGlobalVisualStudio10Generator.cxx
View File

@ -42,8 +42,8 @@ class cmGlobalVisualStudio10Generator::Factory
: public cmGlobalGeneratorFactory : public cmGlobalGeneratorFactory
{ {
public: public:
virtual cmGlobalGenerator* CreateGlobalGenerator(const std::string& name, cmGlobalGenerator* CreateGlobalGenerator(const std::string& name,
cmake* cm) const cmake* cm) const CM_OVERRIDE
{ {
std::string genName; std::string genName;
const char* p = cmVS10GenName(name, genName); const char* p = cmVS10GenName(name, genName);
@ -65,21 +65,21 @@ public:
return 0; return 0;
} }
virtual void GetDocumentation(cmDocumentationEntry& entry) const void GetDocumentation(cmDocumentationEntry& entry) const CM_OVERRIDE
{ {
entry.Name = std::string(vs10generatorName) + " [arch]"; entry.Name = std::string(vs10generatorName) + " [arch]";
entry.Brief = "Generates Visual Studio 2010 project files. " entry.Brief = "Generates Visual Studio 2010 project files. "
"Optional [arch] can be \"Win64\" or \"IA64\"."; "Optional [arch] can be \"Win64\" or \"IA64\".";
} }
virtual void GetGenerators(std::vector<std::string>& names) const void GetGenerators(std::vector<std::string>& names) const CM_OVERRIDE
{ {
names.push_back(vs10generatorName); names.push_back(vs10generatorName);
names.push_back(vs10generatorName + std::string(" IA64")); names.push_back(vs10generatorName + std::string(" IA64"));
names.push_back(vs10generatorName + std::string(" Win64")); names.push_back(vs10generatorName + std::string(" Win64"));
} }
virtual bool SupportsToolset() const { return true; } bool SupportsToolset() const CM_OVERRIDE { return true; }
}; };
cmGlobalGeneratorFactory* cmGlobalVisualStudio10Generator::NewFactory() cmGlobalGeneratorFactory* cmGlobalVisualStudio10Generator::NewFactory()

10
Source/cmGlobalVisualStudio11Generator.cxx
View File

@ -36,8 +36,8 @@ class cmGlobalVisualStudio11Generator::Factory
: public cmGlobalGeneratorFactory : public cmGlobalGeneratorFactory
{ {
public: public:
virtual cmGlobalGenerator* CreateGlobalGenerator(const std::string& name, cmGlobalGenerator* CreateGlobalGenerator(const std::string& name,
cmake* cm) const cmake* cm) const CM_OVERRIDE
{ {
std::string genName; std::string genName;
const char* p = cmVS11GenName(name, genName); const char* p = cmVS11GenName(name, genName);
@ -70,14 +70,14 @@ public:
return ret; return ret;
} }
virtual void GetDocumentation(cmDocumentationEntry& entry) const void GetDocumentation(cmDocumentationEntry& entry) const CM_OVERRIDE
{ {
entry.Name = std::string(vs11generatorName) + " [arch]"; entry.Name = std::string(vs11generatorName) + " [arch]";
entry.Brief = "Generates Visual Studio 2012 project files. " entry.Brief = "Generates Visual Studio 2012 project files. "
"Optional [arch] can be \"Win64\" or \"ARM\"."; "Optional [arch] can be \"Win64\" or \"ARM\".";
} }
virtual void GetGenerators(std::vector<std::string>& names) const void GetGenerators(std::vector<std::string>& names) const CM_OVERRIDE
{ {
names.push_back(vs11generatorName); names.push_back(vs11generatorName);
names.push_back(vs11generatorName + std::string(" ARM")); names.push_back(vs11generatorName + std::string(" ARM"));
@ -91,7 +91,7 @@ public:
} }
} }
virtual bool SupportsToolset() const { return true; } bool SupportsToolset() const CM_OVERRIDE { return true; }
}; };
cmGlobalGeneratorFactory* cmGlobalVisualStudio11Generator::NewFactory() cmGlobalGeneratorFactory* cmGlobalVisualStudio11Generator::NewFactory()

10
Source/cmGlobalVisualStudio12Generator.cxx
View File

@ -36,8 +36,8 @@ class cmGlobalVisualStudio12Generator::Factory
: public cmGlobalGeneratorFactory : public cmGlobalGeneratorFactory
{ {
public: public:
virtual cmGlobalGenerator* CreateGlobalGenerator(const std::string& name, cmGlobalGenerator* CreateGlobalGenerator(const std::string& name,
cmake* cm) const cmake* cm) const CM_OVERRIDE
{ {
std::string genName; std::string genName;
const char* p = cmVS12GenName(name, genName); const char* p = cmVS12GenName(name, genName);
@ -59,21 +59,21 @@ public:
return 0; return 0;
} }
virtual void GetDocumentation(cmDocumentationEntry& entry) const void GetDocumentation(cmDocumentationEntry& entry) const CM_OVERRIDE
{ {
entry.Name = std::string(vs12generatorName) + " [arch]"; entry.Name = std::string(vs12generatorName) + " [arch]";
entry.Brief = "Generates Visual Studio 2013 project files. " entry.Brief = "Generates Visual Studio 2013 project files. "
"Optional [arch] can be \"Win64\" or \"ARM\"."; "Optional [arch] can be \"Win64\" or \"ARM\".";
} }
virtual void GetGenerators(std::vector<std::string>& names) const void GetGenerators(std::vector<std::string>& names) const CM_OVERRIDE
{ {
names.push_back(vs12generatorName); names.push_back(vs12generatorName);
names.push_back(vs12generatorName + std::string(" ARM")); names.push_back(vs12generatorName + std::string(" ARM"));
names.push_back(vs12generatorName + std::string(" Win64")); names.push_back(vs12generatorName + std::string(" Win64"));
} }
virtual bool SupportsToolset() const { return true; } bool SupportsToolset() const CM_OVERRIDE { return true; }
}; };
cmGlobalGeneratorFactory* cmGlobalVisualStudio12Generator::NewFactory() cmGlobalGeneratorFactory* cmGlobalVisualStudio12Generator::NewFactory()

10
Source/cmGlobalVisualStudio14Generator.cxx
View File

@ -36,8 +36,8 @@ class cmGlobalVisualStudio14Generator::Factory
: public cmGlobalGeneratorFactory : public cmGlobalGeneratorFactory
{ {
public: public:
virtual cmGlobalGenerator* CreateGlobalGenerator(const std::string& name, cmGlobalGenerator* CreateGlobalGenerator(const std::string& name,
cmake* cm) const cmake* cm) const CM_OVERRIDE
{ {
std::string genName; std::string genName;
const char* p = cmVS14GenName(name, genName); const char* p = cmVS14GenName(name, genName);
@ -59,21 +59,21 @@ public:
return 0; return 0;
} }
virtual void GetDocumentation(cmDocumentationEntry& entry) const void GetDocumentation(cmDocumentationEntry& entry) const CM_OVERRIDE
{ {
entry.Name = std::string(vs14generatorName) + " [arch]"; entry.Name = std::string(vs14generatorName) + " [arch]";
entry.Brief = "Generates Visual Studio 2015 project files. " entry.Brief = "Generates Visual Studio 2015 project files. "
"Optional [arch] can be \"Win64\" or \"ARM\"."; "Optional [arch] can be \"Win64\" or \"ARM\".";
} }
virtual void GetGenerators(std::vector<std::string>& names) const void GetGenerators(std::vector<std::string>& names) const CM_OVERRIDE
{ {
names.push_back(vs14generatorName); names.push_back(vs14generatorName);
names.push_back(vs14generatorName + std::string(" ARM")); names.push_back(vs14generatorName + std::string(" ARM"));
names.push_back(vs14generatorName + std::string(" Win64")); names.push_back(vs14generatorName + std::string(" Win64"));
} }
virtual bool SupportsToolset() const { return true; } bool SupportsToolset() const CM_OVERRIDE { return true; }
}; };
cmGlobalGeneratorFactory* cmGlobalVisualStudio14Generator::NewFactory() cmGlobalGeneratorFactory* cmGlobalVisualStudio14Generator::NewFactory()

10
Source/cmGlobalVisualStudio8Generator.cxx
View File

@ -25,8 +25,8 @@ static const char vs8generatorName[] = "Visual Studio 8 2005";
class cmGlobalVisualStudio8Generator::Factory : public cmGlobalGeneratorFactory class cmGlobalVisualStudio8Generator::Factory : public cmGlobalGeneratorFactory
{ {
public: public:
virtual cmGlobalGenerator* CreateGlobalGenerator(const std::string& name, cmGlobalGenerator* CreateGlobalGenerator(const std::string& name,
cmake* cm) const cmake* cm) const CM_OVERRIDE
{ {
if (strncmp(name.c_str(), vs8generatorName, if (strncmp(name.c_str(), vs8generatorName,
sizeof(vs8generatorName) - 1) != 0) { sizeof(vs8generatorName) - 1) != 0) {
@ -60,14 +60,14 @@ public:
return ret; return ret;
} }
virtual void GetDocumentation(cmDocumentationEntry& entry) const void GetDocumentation(cmDocumentationEntry& entry) const CM_OVERRIDE
{ {
entry.Name = std::string(vs8generatorName) + " [arch]"; entry.Name = std::string(vs8generatorName) + " [arch]";
entry.Brief = "Generates Visual Studio 2005 project files. " entry.Brief = "Generates Visual Studio 2005 project files. "
"Optional [arch] can be \"Win64\"."; "Optional [arch] can be \"Win64\".";
} }
virtual void GetGenerators(std::vector<std::string>& names) const void GetGenerators(std::vector<std::string>& names) const CM_OVERRIDE
{ {
names.push_back(vs8generatorName); names.push_back(vs8generatorName);
names.push_back(vs8generatorName + std::string(" Win64")); names.push_back(vs8generatorName + std::string(" Win64"));
@ -82,7 +82,7 @@ public:
} }
} }
virtual bool SupportsToolset() const { return false; } bool SupportsToolset() const CM_OVERRIDE { return false; }
}; };
cmGlobalGeneratorFactory* cmGlobalVisualStudio8Generator::NewFactory() cmGlobalGeneratorFactory* cmGlobalVisualStudio8Generator::NewFactory()

10
Source/cmGlobalVisualStudio9Generator.cxx
View File

@ -23,8 +23,8 @@ static const char vs9generatorName[] = "Visual Studio 9 2008";
class cmGlobalVisualStudio9Generator::Factory : public cmGlobalGeneratorFactory class cmGlobalVisualStudio9Generator::Factory : public cmGlobalGeneratorFactory
{ {
public: public:
virtual cmGlobalGenerator* CreateGlobalGenerator(const std::string& name, cmGlobalGenerator* CreateGlobalGenerator(const std::string& name,
cmake* cm) const cmake* cm) const CM_OVERRIDE
{ {
if (strncmp(name.c_str(), vs9generatorName, if (strncmp(name.c_str(), vs9generatorName,
sizeof(vs9generatorName) - 1) != 0) { sizeof(vs9generatorName) - 1) != 0) {
@ -62,14 +62,14 @@ public:
return ret; return ret;
} }
virtual void GetDocumentation(cmDocumentationEntry& entry) const void GetDocumentation(cmDocumentationEntry& entry) const CM_OVERRIDE
{ {
entry.Name = std::string(vs9generatorName) + " [arch]"; entry.Name = std::string(vs9generatorName) + " [arch]";
entry.Brief = "Generates Visual Studio 2008 project files. " entry.Brief = "Generates Visual Studio 2008 project files. "
"Optional [arch] can be \"Win64\" or \"IA64\"."; "Optional [arch] can be \"Win64\" or \"IA64\".";
} }
virtual void GetGenerators(std::vector<std::string>& names) const void GetGenerators(std::vector<std::string>& names) const CM_OVERRIDE
{ {
names.push_back(vs9generatorName); names.push_back(vs9generatorName);
names.push_back(vs9generatorName + std::string(" Win64")); names.push_back(vs9generatorName + std::string(" Win64"));
@ -85,7 +85,7 @@ public:
} }
} }
virtual bool SupportsToolset() const { return false; } bool SupportsToolset() const CM_OVERRIDE { return false; }
}; };
cmGlobalGeneratorFactory* cmGlobalVisualStudio9Generator::NewFactory() cmGlobalGeneratorFactory* cmGlobalVisualStudio9Generator::NewFactory()

10
Source/cmGlobalXCodeGenerator.cxx
View File

@ -108,20 +108,20 @@ public:
class cmGlobalXCodeGenerator::Factory : public cmGlobalGeneratorFactory class cmGlobalXCodeGenerator::Factory : public cmGlobalGeneratorFactory
{ {
public: public:
virtual cmGlobalGenerator* CreateGlobalGenerator(const std::string& name, cmGlobalGenerator* CreateGlobalGenerator(const std::string& name,
cmake* cm) const; cmake* cm) const CM_OVERRIDE;
virtual void GetDocumentation(cmDocumentationEntry& entry) const void GetDocumentation(cmDocumentationEntry& entry) const CM_OVERRIDE
{ {
cmGlobalXCodeGenerator::GetDocumentation(entry); cmGlobalXCodeGenerator::GetDocumentation(entry);
} }
virtual void GetGenerators(std::vector<std::string>& names) const void GetGenerators(std::vector<std::string>& names) const CM_OVERRIDE
{ {
names.push_back(cmGlobalXCodeGenerator::GetActualName()); names.push_back(cmGlobalXCodeGenerator::GetActualName());
} }
virtual bool SupportsToolset() const { return true; } bool SupportsToolset() const CM_OVERRIDE { return true; }
}; };
cmGlobalXCodeGenerator::cmGlobalXCodeGenerator(cmake* cm, cmGlobalXCodeGenerator::cmGlobalXCodeGenerator(cmake* cm,