Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-06-06 05:15:44 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-06-06 05:15:44 +0400
commited338da8c963cfcc26315584bb694a95f2c89088 (patch)
treee21a68328e7d0d1f4d41f95fd27690172bfc0957 /source/gameengine/Expressions/Operator1Expr.h
parent0cc077ec455e701a1d3caa1350051f7d3737763b (diff)
- WITH_CXX_GUARDEDALLOC working again
- CMake building without python or fluidsim working again (broke in recent commit) - remove BLI_short_filename(), it wasnt used anywhere.
Diffstat (limited to 'source/gameengine/Expressions/Operator1Expr.h')
-rw-r--r--source/gameengine/Expressions/Operator1Expr.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Expressions/Operator1Expr.h b/source/gameengine/Expressions/Operator1Expr.h
index c2bc68076a0..62f178fb9f7 100644
--- a/source/gameengine/Expressions/Operator1Expr.h
+++ b/source/gameengine/Expressions/Operator1Expr.h
@@ -50,7 +50,7 @@ private:
#ifdef WITH_CXX_GUARDEDALLOC
public:
- void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:COperator1Expr"); }
+ void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:COperator1Expr"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
#endif
};