Merge topic 'minor-cleanups'

80bda168 Simplify use of binary_search.
1927e4ba Remove const char string comparison helper.

2 files changed, 1 insertions, 9 deletions

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 9a42ca2..14b5a92 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -519,9 +519,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
     iter = this->SystemIncludesCache.insert(entry).first;
     }
 
-  std::string dirString = dir;
-  return std::binary_search(iter->second.begin(), iter->second.end(),
-                            dirString);
+  return std::binary_search(iter->second.begin(), iter->second.end(), dir);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 3731502..8baf7b3 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -462,12 +462,6 @@ struct cmStrCmp {
     return strcmp(input, m_test.c_str()) == 0;
   }
 
-  // For use with binary_search
-  bool operator()(const char *str1, const char *str2) const
-  {
-    return strcmp(str1, str2) < 0;
-  }
-
 private:
   const std::string m_test;
 };