瀏覽代碼

cmLocalGenerator::AppendDefines: Remove const char* overloads

Accept const std::string& arguments only
Vitaly Stakhovsky 7 年之前
父節點
當前提交
b2c85cb698
共有 4 個文件被更改,包括 8 次插入17 次删除
  1. 1 1
      Source/cmListFileCache.cxx
  2. 2 1
      Source/cmListFileCache.h
  3. 3 3
      Source/cmLocalGenerator.cxx
  4. 2 12
      Source/cmLocalGenerator.h

+ 1 - 1
Source/cmListFileCache.cxx

@@ -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;

+ 2 - 1
Source/cmListFileCache.h

@@ -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
 {

+ 3 - 3
Source/cmLocalGenerator.cxx

@@ -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;
   }
 

+ 2 - 12
Source/cmLocalGenerator.h

@@ -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;