Changeset 4c2e561 for src/Common

Timestamp:

Jul 4, 2023, 4:29:10 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

3430ce8

Parents:

3397eed (diff), 7f1be01 (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:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Common/ScopedMap.h (modified) (3 diffs)

src/Common/ScopedMap.h

@@ -199 +199 @@
         friend class ScopedMap;
         friend class const_iterator;
-        typedef typename ScopedMap::MapType::iterator wrapped_iterator;
-        typedef typename ScopedMap::ScopeList scope_list;
-        typedef typename scope_list::size_type size_type;
+        typedef typename MapType::iterator wrapped_iterator;
+        typedef typename ScopeList::size_type size_type;
 
         /// Checks if this iterator points to a valid item
@@ -220 +219 @@
         }
 
-        iterator(scope_list & _scopes, const wrapped_iterator & _it, size_type inLevel)
+        iterator(ScopeList & _scopes, const wrapped_iterator & _it, size_type inLevel)
                 : scopes(&_scopes), it(_it), level(inLevel) {}
 public:
@@ -266 +265 @@
 
 private:
-        scope_list *scopes;
+        ScopeList *scopes;
         wrapped_iterator it;
         size_type level;