[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32552] trunk/blender: Use DEBUG instead of NDEBUG
Nathan Letwory
nathan at letworyinteractive.com
Mon Oct 18 08:52:13 CEST 2010
Revision: 32552
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32552
Author: jesterking
Date: 2010-10-18 08:52:10 +0200 (Mon, 18 Oct 2010)
Log Message:
-----------
Use DEBUG instead of NDEBUG
Modified Paths:
--------------
trunk/blender/intern/moto/include/MT_assert.h
trunk/blender/source/blender/blenlib/intern/path_util.c
trunk/blender/source/blender/readblenfile/stub/BLO_readblenfileSTUB.c
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
trunk/blender/source/gameengine/GamePlayer/xembed/UnixShell.c
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
Modified: trunk/blender/intern/moto/include/MT_assert.h
===================================================================
--- trunk/blender/intern/moto/include/MT_assert.h 2010-10-18 06:41:16 UTC (rev 32551)
+++ trunk/blender/intern/moto/include/MT_assert.h 2010-10-18 06:52:10 UTC (rev 32552)
@@ -48,7 +48,7 @@
MT_CDECL int MT_QueryAssert(const char *file, int line, const char *predicate, int *do_assert);
-#ifdef NDEBUG
+#if !defined(DEBUG)
#define MT_assert(predicate) ((void)0)
#define BREAKPOINT() ((void)0)
#else
@@ -93,7 +93,7 @@
}
#endif /* windows */
-#endif /* NDEBUG */
+#endif /* !defined(DEBUG) */
#endif
Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/path_util.c 2010-10-18 06:41:16 UTC (rev 32551)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c 2010-10-18 06:52:10 UTC (rev 32552)
@@ -1607,7 +1607,7 @@
} while (temp);
}
}
-#ifndef NDEBUG
+#if defined(DEBUG)
if (strcmp(name, fullname)) {
printf("guessing '%s' == '%s'\n", name, fullname);
}
@@ -1620,7 +1620,7 @@
// with spawnv(P_WAIT, bprogname, argv) instead of system() but
// that's even uglier
GetShortPathName(fullname, fullname, FILE_MAXDIR+FILE_MAXFILE);
-#ifndef NDEBUG
+#if defined(DEBUG)
printf("Shortname = '%s'\n", fullname);
#endif
#endif
Modified: trunk/blender/source/blender/readblenfile/stub/BLO_readblenfileSTUB.c
===================================================================
--- trunk/blender/source/blender/readblenfile/stub/BLO_readblenfileSTUB.c 2010-10-18 06:41:16 UTC (rev 32551)
+++ trunk/blender/source/blender/readblenfile/stub/BLO_readblenfileSTUB.c 2010-10-18 06:52:10 UTC (rev 32552)
@@ -41,7 +41,7 @@
BLO_readblenfilememory(
char *fromBuffer, int fromBufferSize)
{
-#ifndef NDEBUG
+#if defined(DEBUG)
fprintf(GEN_errorstream,
"Error BLO_readblenfilename is a stub\n");
#endif
@@ -52,7 +52,7 @@
BLO_readblenfilename(
char *fileName)
{
-#ifndef NDEBUG
+#if defined(DEBUG)
fprintf(GEN_errorstream,
"Error BLO_readblenfilename is a stub\n");
#endif
@@ -63,7 +63,7 @@
BLO_readblenfilehandle(
int fileHandle)
{
-#ifndef NDEBUG
+#if defined(DEBUG)
fprintf(GEN_errorstream,
"Error BLO_readblenfilehandle is a stub\n");
#endif
@@ -74,7 +74,7 @@
BLO_is_a_runtime(
char *file)
{
-#ifndef NDEBUG
+#if defined(DEBUG)
fprintf(GEN_errorstream,
"Error BLO_is_a_runtime is a stub\n");
#endif
@@ -85,7 +85,7 @@
BLO_read_runtime(
char *file)
{
-#ifndef NDEBUG
+#if defined(DEBUG)
fprintf(GEN_errorstream,
"Error BLO_read_runtime is a stub\n");
#endif
Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp 2010-10-18 06:41:16 UTC (rev 32551)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp 2010-10-18 06:52:10 UTC (rev 32552)
@@ -95,9 +95,9 @@
#ifdef WIN32
#include <windows.h>
-#ifdef NDEBUG
+#if !defined(DEBUG)
#include <wincon.h>
-#endif // NDEBUG
+#endif // !defined(DEBUG)
#endif // WIN32
const int kMinWindowWidth = 100;
@@ -391,7 +391,7 @@
IMB_init();
// Parse command line options
-#ifndef NDEBUG
+#if defined(DEBUG)
printf("argv[0] = '%s'\n", argv[0]);
#endif
@@ -438,7 +438,7 @@
;)
{
-#ifndef NDEBUG
+#if defined(DEBUG)
printf("argv[%d] = '%s' , %i\n", i, argv[i],argc);
#endif
if (argv[i][0] == '-')
@@ -469,7 +469,7 @@
SYS_WriteCommandLineInt(syshandle, paramname, atoi(argv[i]));
SYS_WriteCommandLineFloat(syshandle, paramname, atof(argv[i]));
SYS_WriteCommandLineString(syshandle, paramname, argv[i]);
-#ifndef NDEBUG
+#if defined(DEBUG)
printf("%s = '%s'\n", paramname, argv[i]);
#endif
i++;
@@ -542,9 +542,9 @@
printf("error: too few options for parent window argument.\n");
}
-#ifndef NDEBUG
+#if defined(DEBUG)
printf("XWindows ID = %d\n", parentWindow);
-#endif //NDEBUG
+#endif // defined(DEBUG)
#endif // _WIN32
case 'c':
@@ -745,12 +745,12 @@
else
{
#ifdef WIN32
-#ifdef NDEBUG
+#if !defined(DEBUG)
if (closeConsole)
{
//::FreeConsole(); // Close a console window
}
-#endif // NDEBUG
+#endif // !defined(DEBUG)
#endif // WIN32
Main *maggie = bfd->main;
Scene *scene = bfd->curscene;
Modified: trunk/blender/source/gameengine/GamePlayer/xembed/UnixShell.c
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/xembed/UnixShell.c 2010-10-18 06:41:16 UTC (rev 32551)
+++ trunk/blender/source/gameengine/GamePlayer/xembed/UnixShell.c 2010-10-18 06:52:10 UTC (rev 32552)
@@ -58,7 +58,7 @@
/* --------------------------------------------------------------------- */
/** If defined: write to the plugin log file */
-#ifndef NDEBUG
+#if defined(DEBUG)
#define NZC_GENERATE_LOG
#endif
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp 2010-10-18 06:41:16 UTC (rev 32551)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp 2010-10-18 06:52:10 UTC (rev 32552)
@@ -13,7 +13,7 @@
#include "RAS_TexVert.h"
#include "MT_assert.h"
-//#ifndef NDEBUG
+//#if defined(DEBUG)
//#ifdef WIN32
//#define spit(x) std::cout << x << std::endl;
//#endif //WIN32
More information about the Bf-blender-cvs
mailing list