Changeset 223a633 for src/ResolvExpr/CurrentObject.cc

Timestamp:

Oct 15, 2020, 3:41:38 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

b9537e6

Parents:

33c3ded (diff), 0b18db7 (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/ResolvExpr/CurrentObject.cc (modified) (2 diffs)

src/ResolvExpr/CurrentObject.cc

@@ -594 +594 @@
         class SimpleIterator final : public MemberIterator {
                 CodeLocation location;
-                readonly< Type > type = nullptr;
+                const Type * type = nullptr;
         public:
                 SimpleIterator( const CodeLocation & loc, const Type * t ) : location( loc ), type( t ) {}
@@ -630 +630 @@
         class ArrayIterator final : public MemberIterator {
                 CodeLocation location;
-                readonly< ArrayType > array = nullptr;
-                readonly< Type > base = nullptr;
+                const ArrayType * array = nullptr;
+                const Type * base = nullptr;
                 size_t index = 0;
                 size_t size = 0;