Changeset d41280e for src/InitTweak

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, stuck-waitfor-destruct, 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

Location:

src/InitTweak

Files:

• BasicInit.cc (modified) (1 diff)
• DeclarationHoister.cc (modified) (1 diff)
• InitExpander.cc (modified) (1 diff)
• InitExpander.h (modified) (1 diff)
• InitModel.h (modified) (2 diffs)

src/InitTweak/BasicInit.cc

@@ -20 +20 @@
 #include <algorithm>
 
-#include "utility.h"
+#include "Common/utility.h"
 
 #include "SynTree/Type.h"

src/InitTweak/DeclarationHoister.cc

@@ -20 +20 @@
 #include <algorithm>
 
-#include "utility.h"
+#include "Common/utility.h"
 
 #include "SynTree/Statement.h"

src/InitTweak/InitExpander.cc

@@ -19 +19 @@
 #include <algorithm>
 
-#include "utility.h"
+#include "Common/utility.h"
 #include "InitExpander.h"
 #include "InitModel.h"

src/InitTweak/InitExpander.h

@@ -19 +19 @@
 #include <string>
 
-#include "utility.h"
+#include "Common/utility.h"
 #include "SynTree/Mutator.h"
 #include "SymTab/Indexer.h"

src/InitTweak/InitModel.h

@@ -18 +18 @@
 
 #include "Association.h"
-#include "SemanticError.h"
+#include "Common/SemanticError.h"
 #include "SynTree/Visitor.h"
 
@@ -73 +73 @@
                         void visit( SizeofExpr * ) { throw 0; }
                         void visit( AlignofExpr * ) { throw 0; }
+                        void visit( UntypedOffsetofExpr * ) { throw 0; }
+                        void visit( OffsetofExpr * ) { throw 0; }
                         void visit( AttrExpr * ) { throw 0; }
                         void visit( LogicalExpr * ) { throw 0; }