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

Merge topic 'minor-cleanups'

Browse Source 
80bda168 Simplify use of binary_search.
1927e4ba Remove const char string comparison helper.
This commit is contained in:
Brad King 2014-09-22 09:12:58 -04:00 committed by CMake Topic Stage
commit d8dde37d60
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmGeneratorTarget.cxx
View File

@ -519,9 +519,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
iter = this->SystemIncludesCache.insert(entry).first; iter = this->SystemIncludesCache.insert(entry).first;
} }
std::string dirString = dir; return std::binary_search(iter->second.begin(), iter->second.end(), dir);
return std::binary_search(iter->second.begin(), iter->second.end(),
dirString);
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

6
Source/cmStandardIncludes.h
View File

@ -462,12 +462,6 @@ struct cmStrCmp {
return strcmp(input, m_test.c_str()) == 0; 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: private:
const std::string m_test; const std::string m_test;
}; };