Changeset 54eb5ebd for libcfa/src/heap.hfa

Timestamp:

Jul 23, 2020, 1:33:57 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

e262b5e, f854ee32

Parents:

5751a56 (diff), f19fbbc (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:software/cfa/cfa-cc

File:

• libcfa/src/heap.hfa (modified) (2 diffs)

libcfa/src/heap.hfa

@@ -10 +10 @@
 // Created On       : Tue May 26 11:23:55 2020
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun  1 21:19:00 2020
-// Update Count     : 10
+// Last Modified On : Mon Jul 20 18:52:31 2020
+// Update Count     : 11
 // 
 
@@ -35 +35 @@
         void * resize( void * oaddr, size_t size );
         void * amemalign( size_t align, size_t dim, size_t elemSize );
-        void * cmemalign( size_t align, size_t noOfElems, size_t elemSize );
+        void * cmemalign( size_t align, size_t dim, size_t elemSize );
         size_t malloc_alignment( void * addr );
         bool malloc_zero_fill( void * addr );