- Timestamp:
- Sep 18, 2018, 5:01:11 PM (6 years ago)
- Branches:
- ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
- Children:
- e523b07
- Parents:
- 56b53b2 (diff), 91a950c (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. - Location:
- libcfa
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
libcfa/configure
r56b53b2 r72b0573 1959 1959 1960 1960 1961 1961 1962 am__api_version='1.15' 1962 1963 -
libcfa/src/heap.cfa
r56b53b2 r72b0573 10 10 // Created On : Tue Dec 19 21:58:35 2017 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Thu Aug 23 06:11:44201813 // Update Count : 51 112 // Last Modified On : Thu Sep 6 09:01:30 2018 13 // Update Count : 513 14 14 // 15 15 … … 329 329 #endif // __CFA_DEBUG__ 330 330 331 assert( heapManager.heapBegin == 0 ); // always perform check, done once 332 heapManager{}; 331 //assert( heapManager.heapBegin != 0 ); 332 //heapManager{}; 333 if ( heapManager.heapBegin == 0 ) heapManager{}; 333 334 } // memory_startup 334 335 … … 700 701 701 702 static inline void * mallocNoStats( size_t size ) { // necessary for malloc statistics 702 assert( heapManager.heapBegin != 0 ); 703 //assert( heapManager.heapBegin != 0 ); 704 if ( unlikely( heapManager.heapBegin == 0 ) ) heapManager{}; // called before memory_startup ? 703 705 void * area = doMalloc( size ); 704 706 if ( unlikely( area == 0 ) ) errno = ENOMEM; // POSIX
Note: See TracChangeset
for help on using the changeset viewer.