From 21bdf5ff91aeca2d69e1da50787e0c81cfa4a1cc Mon Sep 17 00:00:00 2001 From: cxl Date: Tue, 3 May 2016 21:58:17 +0000 Subject: [PATCH] Heap fix git-svn-id: svn://ultimatepp.org/upp/trunk@9791 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/sheap.cpp | 4 ++-- uppsrc/Core/todo.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/uppsrc/Core/sheap.cpp b/uppsrc/Core/sheap.cpp index c6dfa4c68..d97ca28a2 100644 --- a/uppsrc/Core/sheap.cpp +++ b/uppsrc/Core/sheap.cpp @@ -409,6 +409,8 @@ void MemoryFree48(void *ptr) heap->Free48(ptr); } +#endif + void MemoryFreeThread() { if(!heap) @@ -451,6 +453,4 @@ MemoryProfile *PeakMemoryProfile() #endif -#endif - END_UPP_NAMESPACE diff --git a/uppsrc/Core/todo.txt b/uppsrc/Core/todo.txt index a558be47b..bb1b5353f 100644 --- a/uppsrc/Core/todo.txt +++ b/uppsrc/Core/todo.txt @@ -34,11 +34,11 @@ Stream& Stream::operator/(int& i) { dword w = 0; if(IsStoring()) w = CoWork pipe max_queue -SerializeRaw - int64! - ----------------------- DONE +SerializeRaw - int64! + StringBuffer 2GB limit Remove NanoStrings