Changeset 893e106 for src/AST/Expr.cpp


Ignore:
Timestamp:
May 22, 2019, 5:23:02 PM (3 years ago)
Author:
Aaron Moss <a3moss@…>
Branches:
arm-eh, cleanup-dtors, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
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:
1 edited

Legend:

Unmodified
Added
Removed
  • src/AST/Expr.cpp

    r76ed81f r893e106  
    159159        assert( aggregate->result );
    160160
     161<<<<<<< HEAD
    161162        // #warning Needs GenericSubsitution.cpp building to work correctly
    162163        // result.set_and_mutate( mem->get_type() )->qualifiers |= aggregate->result->qualifiers | CV::Lvalue;  // FIXME temporary patch
     
    168169        // ensure lvalue and appropriate restrictions from aggregate type
    169170        result.get_and_mutate()->qualifiers |= aggregate->result->qualifiers | CV::Lvalue;
     171=======
     172//      assert(!"unimplemented; need TypeSubstitution, genericSubstitution");
     173>>>>>>> ef5ef56042ce2b547da955746d9986e26cf628ca
    170174}
    171175
Note: See TracChangeset for help on using the changeset viewer.