Changeset e67a82d for src/Common/Stats/Heap.h

Timestamp:

Aug 20, 2020, 11:48:15 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d685cb0

Parents:

67ca73e (diff), 013b028 (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:

fix conflicts

File:

• src/Common/Stats/Heap.h (modified) (1 diff)

src/Common/Stats/Heap.h

@@ -20 +20 @@
                 void newPass( const char * const name );
                 void print();
+
+                size_t new_stacktrace_id(const char * const name);
+                void stacktrace_push(size_t id);
+                void stacktrace_pop();
         }
 }