diff options
Diffstat (limited to 'src/ClashAvoider.cpp')
| -rw-r--r-- | src/ClashAvoider.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/ClashAvoider.cpp b/src/ClashAvoider.cpp index ece002f8..7c770cea 100644 --- a/src/ClashAvoider.cpp +++ b/src/ClashAvoider.cpp @@ -72,8 +72,6 @@ ClashAvoider::map_path(const raul::Path& in) if (m != _symbol_map.end()) { return m->second; } else { - using InsertRecord = std::pair<SymbolMap::iterator, bool>; - // See if parent is mapped raul::Path parent = in.parent(); do { @@ -81,7 +79,7 @@ ClashAvoider::map_path(const raul::Path& in) if (p != _symbol_map.end()) { const raul::Path mapped = raul::Path( p->second.base() + in.substr(parent.base().length())); - InsertRecord i = _symbol_map.emplace(in, mapped); + auto i = _symbol_map.emplace(in, mapped); return i.first->second; } parent = parent.parent(); @@ -89,7 +87,7 @@ ClashAvoider::map_path(const raul::Path& in) if (!exists(in) && _symbol_map.find(in) == _symbol_map.end()) { // No clash, use symbol unmodified - InsertRecord i = _symbol_map.emplace(in, in); + auto i = _symbol_map.emplace(in, in); assert(i.second); return i.first->second; @@ -120,7 +118,7 @@ ClashAvoider::map_path(const raul::Path& in) } raul::Symbol sym(name); std::string str = ss.str(); - InsertRecord i = _symbol_map.emplace(in, raul::Path(str)); + auto i = _symbol_map.emplace(in, raul::Path(str)); offset = _store.child_name_offset(in.parent(), sym, false); _offsets.emplace(base_path, offset); return i.first->second; |