Changeset 2a301ff for src/GenPoly/ErasableScopedMap.h

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Resolve conflict

File:

• src/GenPoly/ErasableScopedMap.h (modified) (2 diffs)

src/GenPoly/ErasableScopedMap.h

@@ -57 +57 @@
         /// Starts a new scope
         void beginScope() {
-                Scope scope;
-                scopes.push_back(scope);
+                scopes.emplace_back();
         }
 
@@ -145 +144 @@
                 public std::iterator< std::bidirectional_iterator_tag, value_type > {
         friend class ErasableScopedMap;
-        typedef typename std::map< Key, Value >::iterator wrapped_iterator;
-        typedef typename std::vector< std::map< Key, Value > > scope_list;
-        typedef typename scope_list::size_type size_type;
+        typedef typename Scope::iterator wrapped_iterator;
+        typedef typename ScopeList::size_type size_type;
 
         /// Checks if this iterator points to a valid item