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:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-10-09 23:49:09 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-10-09 23:49:09 +0400
commitccd2e4375a3a8d1338d15d00193ff56da63809c3 (patch)
treeac7f83b460a6e11cfce59918f801a8903510da0f /intern/guardedalloc/MEM_guardedalloc.h
parent9aeced47114793112f0228ae216926d6f689280c (diff)
Fix compilation error after recent libmv change
- Tweaked typedefs in stdint so they match what we've got in BLI_sys_types (needed to explicitly tell sign to MSVC). Not so much harmful to be more explicit here, but we really better to have single stdint int blender. - Tweaked allocations macros so MSVC is happy with structures allocation.
Diffstat (limited to 'intern/guardedalloc/MEM_guardedalloc.h')
-rw-r--r--intern/guardedalloc/MEM_guardedalloc.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h
index aebde0a6425..0b32596b36c 100644
--- a/intern/guardedalloc/MEM_guardedalloc.h
+++ b/intern/guardedalloc/MEM_guardedalloc.h
@@ -256,12 +256,6 @@ public: \
((type*)(what))->~type(); \
MEM_freeN(what); \
} } (void)0
-#define OBJECT_GUARDED_DELETE_ARRAY(what, type, count) \
- { if(what) { \
- for (int i = 0; i < count; i++) ((type*)(what))[i].~type(); \
- MEM_freeN(what); \
- } } (void)0
-
#endif /* __cplusplus */
#ifdef __cplusplus