[Bf-blender-cvs] [a837797] master: Cleanup: quiet warning
Campbell Barton
noreply at git.blender.org
Thu Jul 9 11:45:55 CEST 2015
Commit: a837797740ab5df7193e6cacbfe79383655b43c7
Author: Campbell Barton
Date: Thu Jul 9 19:23:49 2015 +1000
Branches: master
https://developer.blender.org/rBa837797740ab5df7193e6cacbfe79383655b43c7
Cleanup: quiet warning
===================================================================
M source/blender/blenlib/BLI_mempool.h
M source/creator/creator.c
M source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
===================================================================
diff --git a/source/blender/blenlib/BLI_mempool.h b/source/blender/blenlib/BLI_mempool.h
index 25694f4..64e673f 100644
--- a/source/blender/blenlib/BLI_mempool.h
+++ b/source/blender/blenlib/BLI_mempool.h
@@ -67,7 +67,7 @@ void **BLI_mempool_as_tableN(BLI_mempool *pool, const char *allocstr) ATTR_
void BLI_mempool_as_array(BLI_mempool *pool, void *data) ATTR_NONNULL(1, 2);
void *BLI_mempool_as_arrayN(BLI_mempool *pool, const char *allocstr) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2);
-#ifdef DEBUG
+#ifndef NDEBUG
void BLI_mempool_set_memory_debug(void);
#endif
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 33a62c8..37e767b 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -445,7 +445,7 @@ static int debug_mode(int UNUSED(argc), const char **UNUSED(argv), void *data)
G.debug |= G_DEBUG; /* std output printf's */
printf(BLEND_VERSION_STRING_FMT);
MEM_set_memory_debug();
-#ifdef DEBUG
+#ifndef NDEBUG
BLI_mempool_set_memory_debug();
#endif
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index faa29e1..a56d5b6 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -599,7 +599,7 @@ int main(int argc, char** argv)
i++;
G.debug |= G_DEBUG;
MEM_set_memory_debug();
-#ifdef DEBUG
+#ifndef NDEBUG
BLI_mempool_set_memory_debug();
#endif
break;
More information about the Bf-blender-cvs
mailing list