Changeset 893e106 for src/AST/Expr.cpp

Timestamp:

May 22, 2019, 5:23:02 PM (4 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

arm-eh, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

722c4831

Parents:

76ed81f (diff), ef5ef56 (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/AST/Expr.cpp (modified) (2 diffs)

src/AST/Expr.cpp

@@ -159 +159 @@
         assert( aggregate->result );
 
+<<<<<<< HEAD
         // #warning Needs GenericSubsitution.cpp building to work correctly
         // result.set_and_mutate( mem->get_type() )->qualifiers |= aggregate->result->qualifiers | CV::Lvalue;  // FIXME temporary patch
@@ -168 +169 @@
         // ensure lvalue and appropriate restrictions from aggregate type
         result.get_and_mutate()->qualifiers |= aggregate->result->qualifiers | CV::Lvalue;
+=======
+//      assert(!"unimplemented; need TypeSubstitution, genericSubstitution");
+>>>>>>> ef5ef56042ce2b547da955746d9986e26cf628ca
 }