Ignore:
Timestamp:
Feb 8, 2016, 10:07:42 AM (10 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
c44e622
Parents:
00ede9e (diff), bd85400 (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 gc_noraii

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/InitTweak/InitModel.h

    r00ede9e rd41280e  
    1818
    1919#include "Association.h"
    20 #include "SemanticError.h"
     20#include "Common/SemanticError.h"
    2121#include "SynTree/Visitor.h"
    2222
     
    7373                        void visit( SizeofExpr * ) { throw 0; }
    7474                        void visit( AlignofExpr * ) { throw 0; }
     75                        void visit( UntypedOffsetofExpr * ) { throw 0; }
     76                        void visit( OffsetofExpr * ) { throw 0; }
    7577                        void visit( AttrExpr * ) { throw 0; }
    7678                        void visit( LogicalExpr * ) { throw 0; }
Note: See TracChangeset for help on using the changeset viewer.