Changeset 722c4831 for src/AST/Expr.cpp

Timestamp:

May 22, 2019, 5:32:46 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

489bacf, f23de79d

Parents:

893e106

Message:

Temporary patch around Pass issues

File:

• src/AST/Expr.cpp (modified) (1 diff)

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
-
-        // take ownership of member type
-        result = mem->get_type();
-        // substitute aggregate generic parameters into member type
-        genericSubsitution( aggregate->result ).apply( result );
-        // ensure lvalue and appropriate restrictions from aggregate type
-        result.get_and_mutate()->qualifiers |= aggregate->result->qualifiers | CV::Lvalue;
-=======
-//      assert(!"unimplemented; need TypeSubstitution, genericSubstitution");
->>>>>>> ef5ef56042ce2b547da955746d9986e26cf628ca
+        #warning Needs GenericSubsitution.cpp building to work correctly
+        result.set_and_mutate( mem->get_type() )->qualifiers |= aggregate->result->qualifiers | CV::Lvalue;  // FIXME temporary patch
+
+        // // take ownership of member type
+        // result = mem->get_type();
+        // // substitute aggregate generic parameters into member type
+        // genericSubsitution( aggregate->result ).apply( result );
+        // // ensure lvalue and appropriate restrictions from aggregate type
+        // result.get_and_mutate()->qualifiers |= aggregate->result->qualifiers | CV::Lvalue;
 }