Changeset 23b6643f for src/examples/gc_no_raii/src/internal/memory_pool.h

Timestamp:

Sep 20, 2016, 4:47:34 PM (8 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, with_gc

Children:

1132b62

Parents:

aefcc3b (diff), db46512 (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 tuples

Conflicts:

src/Makefile.in
src/ResolvExpr/Unify.cc
src/SynTree/Type.h

File:

• src/examples/gc_no_raii/src/internal/memory_pool.h (modified) (2 diffs)

src/examples/gc_no_raii/src/internal/memory_pool.h

@@ -27 +27 @@
 };
 
-void ctor(      gc_memory_pool *const this,
+void ?{}(       gc_memory_pool* this,
                 size_t size,
                 gc_memory_pool* next,
@@ -34 +34 @@
         );
 
-void dtor(gc_memory_pool *const this);
+void ^?{}(gc_memory_pool* this);
 
 struct gc_pool_object_iterator