Changeset 747a7c1 for src/Common

Timestamp:

Feb 10, 2023, 12:15:06 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

966b4c6

Parents:

8fa77eb (diff), 5e3f1e1 (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) (1 diff)

src/Common/ScopedMap.h

@@ -170 +170 @@
         size_type erase( const Key & key ) {
                 for ( auto it = scopes.rbegin() ; it != scopes.rend() ; ++it ) {
-                        if ( size_type i = it->map.erase( key ) ; 0 != i ) return i;
+                        size_type i = it->map.erase( key );
+                        if ( 0 != i ) return i;
                 }
                 return 0;