Changeset 1eba452 for src/examples/gc_no_raii/bug-repro

Timestamp:

Sep 15, 2016, 10:29:43 AM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, stuck-waitfor-destruct, with_gc

Children:

fc4a0fa, fd782b2

Parents:

96a10cdd (diff), 50c5cf3 (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:/u/cforall/software/cfa/cfa-cc

Conflicts:

src/Parser/parser.cc

Location:

src/examples/gc_no_raii/bug-repro

Files:

• field.c (modified) (2 diffs)
• oddtype.c (added)

src/examples/gc_no_raii/bug-repro/field.c

@@ -62 +62 @@
 {
         struct gc_object_header* object;
-        #if _DEBUG
+        #ifndef NDEBUG
                 intptr_t lower_limit;
                 intptr_t upper_limit;
@@ -71 +71 @@
                 gc_pool_object_iterator* const this,
                 void* start_object
-                #if _DEBUG
+                #ifndef NDEBUG
                         , intptr_t pool_start
                         , intptr_t pool_end