From 1927e4bacb8e3183488c0e71a18b73aa62e5f53a Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 17 Sep 2014 15:07:55 +0200 Subject: Remove const char string comparison helper. It is now unused. --- Source/cmStandardIncludes.h | 6 ------ 1 file changed, 6 deletions(-) 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; }; -- cgit v0.12 From 80bda1684d48b19a05637fe4167b5f9b1fd8ce2d Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 6 Aug 2014 15:20:24 +0200 Subject: Simplify use of binary_search. A local string was created when dir was a const char*. Now dir is a std::string already so the dirString is vestigal. --- Source/cmGeneratorTarget.cxx | 4 +--- 1 file changed, 1 insertion(+), 3 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); } //---------------------------------------------------------------------------- -- cgit v0.12