Changeset 99cadc60 for libcfa/src/heap.cfa

Timestamp:

Jul 31, 2019, 3:26:06 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

61cfae2

Parents:

c60a664 (diff), 40287c8 (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.cfa (modified) (3 diffs)

libcfa/src/heap.cfa

@@ -10 +10 @@
 // Created On       : Tue Dec 19 21:58:35 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 19 16:07:46 2019
-// Update Count     : 548
+// Last Modified On : Wed Jul 24 13:12:45 2019
+// Update Count     : 550
 //
 
@@ -248 +248 @@
 
 #ifdef FASTLOOKUP
-static_assert( 16 == sizeof(HeapManager.Storage), "size of HeapManager Storage wrong" ); // FIX ME
-enum { LookupSizes = 65_536 + 16 };                                             // number of fast lookup sizes
+enum { LookupSizes = 65_536 + sizeof(HeapManager.Storage) }; // number of fast lookup sizes
 static unsigned char lookup[LookupSizes];                               // O(1) lookup for small sizes
 #endif // FASTLOOKUP
@@ -869 +868 @@
                 void * area;
                 if ( unlikely( alignment != 0 ) ) {                             // previous request memalign?
-                        area = memalign( alignment, size );                     // create new area
+                        area = memalign( alignment, size );                     // create new aligned area
                 } else {
                         area = mallocNoStats( size );                           // create new area