Ignore:
Timestamp:
Jul 4, 2023, 4:29:10 PM (15 months 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:
1 edited

Legend:

Unmodified
Added
Removed

  • src/GenPoly/ErasableScopedMap.h

    r3397eed r4c2e561  
    5757        /// Starts a new scope
    5858        void beginScope() {
    59                 Scope scope;
    60                 scopes.push_back(scope);
     59                scopes.emplace_back();
    6160        }
    6261
    … …  
    145144                public std::iterator< std::bidirectional_iterator_tag, value_type > {
    146145        friend class ErasableScopedMap;
    147         typedef typename std::map< Key, Value >::iterator wrapped_iterator;
    148         typedef typename std::vector< std::map< Key, Value > > scope_list;
    149         typedef typename scope_list::size_type size_type;
     146        typedef typename Scope::iterator wrapped_iterator;
     147        typedef typename ScopeList::size_type size_type;
    150148
    151149        /// Checks if this iterator points to a valid item
Note: See TracChangeset for help on using the changeset viewer.