sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Building with C++ guarded alloc works again

Browse Source
This commit is contained in:
Campbell Barton 2014-04-16 02:22:49 +10:00
parent 5c4bb81e49
commit cf01f2c760
5 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/compositor/intern/COM_Converter.h
View File

@ -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;

2
source/blender/compositor/intern/COM_ExecutionGroup.cpp
View File

@ -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);

4
source/blender/compositor/intern/COM_NodeConverter.h
View File

@ -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;

4
source/blender/compositor/intern/COM_NodeGraph.h
View File

@ -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;

2
source/blender/compositor/intern/COM_WorkScheduler.cpp
View File

@ -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;