From f7579e876c190f652e7016d3b603ce78cb1ca3a6 Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 2 May 2016 14:37:08 +0000 Subject: [PATCH] Fixed issue with CoWork & callback git-svn-id: svn://ultimatepp.org/upp/trunk@9763 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/CoWork.h | 2 +- uppsrc/Core/sheap.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/uppsrc/Core/CoWork.h b/uppsrc/Core/CoWork.h index df1237f5c..bd7d234c6 100644 --- a/uppsrc/Core/CoWork.h +++ b/uppsrc/Core/CoWork.h @@ -46,7 +46,7 @@ public: public: void Do(Function&& fn); - void Do(const Callback& cb) { Do(clone(cb)); } + void Do(const Callback& cb) { Do(Function(clone(cb))); } void Do(const Function& fn) { Do(clone(fn)); } CoWork& operator&(const Callback& cb) { Do(cb); return *this; } diff --git a/uppsrc/Core/sheap.cpp b/uppsrc/Core/sheap.cpp index af9032db3..9e480d366 100644 --- a/uppsrc/Core/sheap.cpp +++ b/uppsrc/Core/sheap.cpp @@ -308,7 +308,6 @@ void *MemoryAllok__(int klass) return heap->Allok(klass); } - #if defined(HEAPDBG) void *MemoryAlloc_(size_t sz)