Changeset 22f94a4 for src/Common

Timestamp:

Aug 11, 2020, 4:40:15 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

0d070ca

Parents:

07d867b (diff), 129674b (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' into new-ast

Location:

src/Common

Files:

• PassVisitor.proto.h (modified) (1 diff)
• ScopedMap.h (modified) (1 diff)

src/Common/PassVisitor.proto.h

@@ -38 +38 @@
         };
 
-        std::stack< cleanup_t, std::vector<cleanup_t> > cleanups;
+        std::stack< cleanup_t, std::vector< cleanup_t > > cleanups;
 };
 

src/Common/ScopedMap.h

@@ -93 +93 @@
 
                 reference operator* () { return *it; }
-                pointer operator-> () { return it.operator->(); }
+                pointer operator-> () const { return it.operator->(); }
 
                 iterator& operator++ () {