Changeset 7d6639d for src/Common

Timestamp:

Feb 2, 2017, 4:10:26 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

8d6155e9

Parents:

dc99f38 (diff), 7a560c1 (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

Location:

src/Common

Files:

• ScopedMap.h (modified) (2 diffs)
• VectorMap.h (added)

src/Common/ScopedMap.h

@@ -102 +102 @@
                 iterator operator-- (int) { iterator tmp = *this; --(*this); return tmp; }
 
-                bool operator== (const iterator &that) {
+                bool operator== (const iterator &that) const {
                         return scopes == that.scopes && level == that.level && it == that.it;
                 }
-                bool operator!= (const iterator &that) { return !( *this == that ); }
+                bool operator!= (const iterator &that) const { return !( *this == that ); }
 
                 size_type get_level() const { return level; }
@@ -180 +180 @@
                 const_iterator operator-- (int) { const_iterator tmp = *this; --(*this); return tmp; }
 
-                bool operator== (const const_iterator &that) {
+                bool operator== (const const_iterator &that) const {
                         return scopes == that.scopes && level == that.level && it == that.it;
                 }
-                bool operator!= (const const_iterator &that) { return !( *this == that ); }
+                bool operator!= (const const_iterator &that) const { return !( *this == that ); }
 
                 size_type get_level() const { return level; }