mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 17:15:31 +00:00
Code Activity

Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable

Browse source
This commit is contained in:
Nikolaj Bjorner 2013-04-28 12:48:10 -07:00
commit 8abdefef6d
46 changed files with 954 additions and 377 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/util/memory_manager.cpp
View file

@ -231,9 +231,8 @@ void * memory::allocate(size_t s) {
return 0;
s = s + sizeof(size_t); // we allocate an extra field!
void * r = malloc(s);
if (r == 0) {
if (r == 0)
throw_out_of_memory();
}
*(static_cast<size_t*>(r)) = s;
g_memory_thread_alloc_size += s;
if (g_memory_thread_alloc_size > SYNCH_THRESHOLD) {