From cf01f2c7606b7ad5ed872252613632777816814a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 16 Apr 2014 02:22:49 +1000 Subject: Building with C++ guarded alloc works again --- source/blender/compositor/intern/COM_Converter.h | 4 ++++ source/blender/compositor/intern/COM_ExecutionGroup.cpp | 2 +- source/blender/compositor/intern/COM_NodeConverter.h | 4 ++++ source/blender/compositor/intern/COM_NodeGraph.h | 4 ++++ source/blender/compositor/intern/COM_WorkScheduler.cpp | 2 +- 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/source/blender/compositor/intern/COM_Converter.h b/source/blender/compositor/intern/COM_Converter.h index c1ad45bbf54..311cec35644 100644 --- a/source/blender/compositor/intern/COM_Converter.h +++ b/source/blender/compositor/intern/COM_Converter.h @@ -23,6 +23,10 @@ #ifndef _COM_Converter_h #define _COM_Converter_h +#ifdef WITH_CXX_GUARDEDALLOC +# include "MEM_guardedalloc.h" +#endif + struct bNode; class Node; diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp index 586a774b89e..366c97b50c6 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp +++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp @@ -399,7 +399,7 @@ void ExecutionGroup::printBackgroundStats(void) BLI_timestr(execution_time, timestr, sizeof(timestr)); printf("| Elapsed %s ", timestr); - printf("| Tree %s, Tile %d-%d ", this->m_bTree->id.name + 2, + printf("| Tree %s, Tile %u-%u ", this->m_bTree->id.name + 2, this->m_chunksFinished, this->m_numberOfChunks); fputc('\n', stdout); diff --git a/source/blender/compositor/intern/COM_NodeConverter.h b/source/blender/compositor/intern/COM_NodeConverter.h index 51a1a44cade..a67dafde5e1 100644 --- a/source/blender/compositor/intern/COM_NodeConverter.h +++ b/source/blender/compositor/intern/COM_NodeConverter.h @@ -22,6 +22,10 @@ #ifndef _COM_NodeCompiler_h #define _COM_NodeCompiler_h +#ifdef WITH_CXX_GUARDEDALLOC +# include "MEM_guardedalloc.h" +#endif + class NodeInput; class NodeOutput; diff --git a/source/blender/compositor/intern/COM_NodeGraph.h b/source/blender/compositor/intern/COM_NodeGraph.h index 6e2a46e3622..fab4f2b3446 100644 --- a/source/blender/compositor/intern/COM_NodeGraph.h +++ b/source/blender/compositor/intern/COM_NodeGraph.h @@ -30,6 +30,10 @@ extern "C" { #include "DNA_node_types.h" } +#ifdef WITH_CXX_GUARDEDALLOC +# include "MEM_guardedalloc.h" +#endif + class CompositorContext; class Node; class NodeInput; diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp index 4bdc9b731b1..d60f9cb7f10 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.cpp +++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp @@ -335,7 +335,7 @@ void WorkScheduler::initialize(bool use_opencl, int num_cpu_threads) error = clGetPlatformIDs(0, 0, &numberOfPlatforms); if (error == -1001) { } /* GPU not supported */ else if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error)); } - if (G.f & G_DEBUG) printf("%d number of platforms\n", numberOfPlatforms); + if (G.f & G_DEBUG) printf("%u number of platforms\n", numberOfPlatforms); cl_platform_id *platforms = (cl_platform_id *)MEM_mallocN(sizeof(cl_platform_id) * numberOfPlatforms, __func__); error = clGetPlatformIDs(numberOfPlatforms, platforms, 0); unsigned int indexPlatform; -- cgit v1.2.3