mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-12 01:09:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmLocalGenerator::AppendDefines: Remove const char* overloads

Browse Source 
Accept const std::string& arguments only
This commit is contained in:
Vitaly Stakhovsky
2018-10-25 20:32:01 -04:00
parent e07f147377
commit b2c85cb698
4 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmListFileCache.cxx
View File

@@ -481,7 +481,7 @@ std::ostream& operator<<(std::ostream& os, BT<std::string> const& s)
}
std::vector<BT<std::string>> ExpandListWithBacktrace(
const char* list, cmListFileBacktrace const& bt)
std::string const& list, cmListFileBacktrace const& bt)
{
std::vector<BT<std::string>> result;
std::vector<std::string> tmp;

3
Source/cmListFileCache.h
View File

@@ -199,7 +199,8 @@ public:
std::ostream& operator<<(std::ostream& os, BT<std::string> const& s);
std::vector<BT<std::string>> ExpandListWithBacktrace(
const char* list, cmListFileBacktrace const& bt = cmListFileBacktrace());
std::string const& list,
cmListFileBacktrace const& bt = cmListFileBacktrace());
struct cmListFile
{

6
Source/cmLocalGenerator.cxx
View File

@@ -2108,7 +2108,7 @@ void cmLocalGenerator::AppendIncludeDirectories(
}
void cmLocalGenerator::AppendDefines(std::set<std::string>& defines,
const char* defines_list) const
std::string const& defines_list) const
{
std::set<BT<std::string>> tmp;
this->AppendDefines(tmp, ExpandListWithBacktrace(defines_list));
@@ -2118,10 +2118,10 @@ void cmLocalGenerator::AppendDefines(std::set<std::string>& defines,
}
void cmLocalGenerator::AppendDefines(std::set<BT<std::string>>& defines,
const char* defines_list) const
std::string const& defines_list) const
{
// Short-circuit if there are no definitions.
if (!defines_list) {
if (defines_list.empty()) {
return;
}

14
Source/cmLocalGenerator.h
View File

@@ -169,19 +169,9 @@ public:
* command line.
*/
void AppendDefines(std::set<std::string>& defines,
const char* defines_list) const;
void AppendDefines(std::set<std::string>& defines,
std::string const& defines_list) const
{
this->AppendDefines(defines, defines_list.c_str());
}
std::string const& defines_list) const;
void AppendDefines(std::set<BT<std::string>>& defines,
const char* defines_list) const;
void AppendDefines(std::set<BT<std::string>>& defines,
std::string const& defines_list) const
{
this->AppendDefines(defines, defines_list.c_str());
}
std::string const& defines_list) const;
void AppendDefines(std::set<BT<std::string>>& defines,
const std::vector<BT<std::string>>& defines_vec) const;