Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-19 19:43:23 +08:00
Code Issues Projects Releases Wiki Activity

cmDefinitions: Cleanups

Browse Source
This commit is contained in:
Sebastian Holtermann
2019-07-19 09:59:40 +02:00
parent 1f618fae4d
commit 451fd329a8
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmDefinitions.cxx
View File

@@ -13,10 +13,12 @@ cmDefinitions::Def const& cmDefinitions::GetInternal(const std::string& key,
StackIter end, bool raise) StackIter end, bool raise)
{ {
assert(begin != end); assert(begin != end);
MapType::iterator i = begin->Map.find(key); {
if (i != begin->Map.end()) { MapType::iterator it = begin->Map.find(key);
i->second.Used = true; if (it != begin->Map.end()) {
return i->second; it->second.Used = true;
return it->second;
}
} }
StackIter it = begin; StackIter it = begin;
++it; ++it;
@@ -27,7 +29,7 @@ cmDefinitions::Def const& cmDefinitions::GetInternal(const std::string& key,
if (!raise) { if (!raise) {
return def; return def;
} }
return begin->Map.insert(MapType::value_type(key, def)).first->second; return begin->Map.emplace(key, def).first->second;
} }
const std::string* cmDefinitions::Get(const std::string& key, StackIter begin, const std::string* cmDefinitions::Get(const std::string& key, StackIter begin,
@@ -47,8 +49,7 @@ bool cmDefinitions::HasKey(const std::string& key, StackIter begin,
StackIter end) StackIter end)
{ {
for (StackIter it = begin; it != end; ++it) { for (StackIter it = begin; it != end; ++it) {
MapType::const_iterator i = it->Map.find(key); if (it->Map.find(key) != it->Map.end()) {
if (i != it->Map.end()) {
return true; return true;
} }
} }
@@ -97,8 +98,8 @@ cmDefinitions cmDefinitions::MakeClosure(StackIter begin, StackIter end)
std::vector<std::string> cmDefinitions::ClosureKeys(StackIter begin, std::vector<std::string> cmDefinitions::ClosureKeys(StackIter begin,
StackIter end) StackIter end)
{ {
std::set<std::string> bound;
std::vector<std::string> defined; std::vector<std::string> defined;
std::set<std::string> bound;
for (StackIter it = begin; it != end; ++it) { for (StackIter it = begin; it != end; ++it) {
defined.reserve(defined.size() + it->Map.size()); defined.reserve(defined.size() + it->Map.size());