Cleanup: remove _DEBUG define usage
authorCampbell Barton <ideasman42@gmail.com>
Wed, 27 Aug 2014 08:57:53 +0000 (18:57 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 27 Aug 2014 08:59:32 +0000 (18:59 +1000)
intern/ghost/intern/GHOST_DisplayManagerX11.cpp
intern/ghost/intern/GHOST_SystemPathsWin32.cpp
source/blender/gpu/GPU_buffers.h
source/blender/imbuf/intern/openexr/openexr_api.cpp
source/gameengine/Expressions/Expression.cpp
source/gameengine/Expressions/Expression.h
source/gameengine/Expressions/IntValue.cpp
source/gameengine/Expressions/Value.cpp
source/gameengine/Expressions/Value.h
source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h

index a5457891ec348a8b59aa70ba8febf97cdefaaad6..24289e6b0060a6594d1132f4be9b5556c175f870 100644 (file)
@@ -194,7 +194,7 @@ setCurrentDisplaySetting(
                fprintf(stderr, "Error: XF86VidMode extension missing!\n");
                return GHOST_kFailure;
        }
-#  ifdef _DEBUG
+#  ifdef DEBUG
        printf("Using XFree86-VidModeExtension Version %d.%d\n",
               majorVersion, minorVersion);
 #  endif
@@ -240,7 +240,7 @@ setCurrentDisplaySetting(
                }
 
                if (best_fit != -1) {
-#  ifdef _DEBUG
+#  ifdef DEBUG
                        printf("Switching to video mode %dx%d %dx%d %d\n",
                               vidmodes[best_fit]->hdisplay, vidmodes[best_fit]->vdisplay,
                               vidmodes[best_fit]->htotal, vidmodes[best_fit]->vtotal,
index 3a313c792d033c7b0d1baa76836531577dccf167..2bd380050f1544627a8be937c46d8299558c096c 100644 (file)
@@ -37,7 +37,7 @@
 #include <shlobj.h>
 #include "utfconv.h"
 
-#if defined(__MINGW32__) || defined(__CYGWIN__)
+#ifdef __MINGW32__
 
 #if !defined(SHARD_PIDL)
 #define SHARD_PIDL      0x00000001L
index 461995e37b56d58f5b99688386f02373aee966c2..ba461d5f8a290a34e742f851dbe40575c5f7fe1c 100644 (file)
 #ifndef __GPU_BUFFERS_H__
 #define __GPU_BUFFERS_H__
 
-#ifdef _DEBUG
-/*#define DEBUG_VBO(X) printf(X)*/
-#define DEBUG_VBO(X)
+#ifdef DEBUG
+/*  #define DEBUG_VBO(X) printf(X)*/
+#  define DEBUG_VBO(X)
 #else
-#define DEBUG_VBO(X)
+#  define DEBUG_VBO(X)
 #endif
 
 struct BMesh;
index b8b7d15bf285a96b950ce13d5bcfa401bfcb8682..ba1bda640a61b4cc5c5b74df30584f7732828207 100644 (file)
@@ -48,7 +48,7 @@ extern "C"
 {
 
 // The following prevents a linking error in debug mode for MSVC using the libs in CVS
-#if defined(WITH_OPENEXR) && defined(_WIN32) && defined(_DEBUG) && !defined(__MINGW32__) && !defined(__CYGWIN__)
+#if defined(WITH_OPENEXR) && defined(_WIN32) && defined(DEBUG) && !defined(__MINGW32__)
 _CRTIMP void __cdecl _invalid_parameter_noinfo(void)
 {
 }
index c1146aaa65c6fd3327e1a319d815a6275862358d..2428df977d36fe243359afb16971b5c59853e31d 100644 (file)
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
-#ifdef _DEBUG
+#ifdef DEBUG
 //int gRefCountExpr;
 #endif
 CExpression::CExpression()// : m_cached_calculate(NULL)
 {
        m_refcount = 1;
-#ifdef _DEBUG
+#ifdef DEBUG
        //gRefCountExpr++;
 #endif
 }
index d1b7eda43f0f3398b57d89773045c6bf807d7013..9a4f1f932840a171dbe7b339923ec615a7296cc9 100644 (file)
@@ -116,7 +116,7 @@ public:
 
        virtual CExpression * AddRef() { // please leave multiline, for debugger !!!
 
-#ifdef _DEBUG
+#ifdef DEBUG
                //gRefCountExpr++;
                assertd(m_refcount < 255);
 #endif
@@ -124,7 +124,7 @@ public:
                return this;
        };
        virtual CExpression* Release(CExpression* complicatedtrick=NULL) { 
-#ifdef _DEBUG
+#ifdef DEBUG
                //gRefCountExpr--;
 #endif
                if (--m_refcount < 1) 
index a2d055974c390c425386e30a268fe7f4d181f72a..82d2e94dbb07e4debad277af3e84cc4a7e1ecfe8 100644 (file)
@@ -35,7 +35,7 @@ effect: constructs a new CIntValue
 */
 {
        
-#ifdef _DEBUG_
+#ifdef DEBUG_
        m_textval = "Int illegal constructor";
 #endif
        m_pstrRep=NULL;
index 1ced71e66a4a24e4f398752b9c86acbd44ffb164..bdef2dbd5b0e829e85a4a6c0ce58923bde8a819b 100644 (file)
@@ -86,7 +86,7 @@ struct SmartCValueRef
 std::vector<SmartCValueRef> gRefList;
 #endif
 
-#ifdef _DEBUG
+#ifdef DEBUG
 //int gRefCountValue;
 #endif
 
@@ -101,7 +101,7 @@ effect: constucts a CValue
 */
 {
        //debug(gRefCountValue++)       // debugging
-#ifdef _DEBUG
+#ifdef DEBUG
        //gRefCountValue++;
 #ifdef CVALUE_DEBUG
        gRefList.push_back(SmartCValueRef(this));
@@ -460,7 +460,7 @@ void CValue::DisableRefCount()
        m_refcount--;
 
        //debug(gRefCountValue--);
-#ifdef _DEBUG
+#ifdef DEBUG
        //gRefCountValue--;
 #endif
        m_ValFlags.RefCountDisabled=true;
@@ -472,7 +472,7 @@ void CValue::ProcessReplica() /* was AddDataToReplica in 2.48 */
 {
        m_refcount = 1;
        
-#ifdef _DEBUG
+#ifdef DEBUG
        //gRefCountValue++;
 #endif
        PyObjectPlus::ProcessReplica();
index 7f6ce9aa7034ad27316cb05ecc4c14bb3fd06321..c7e9a40a05949097175b4f589e937d69168c03c3 100644 (file)
@@ -90,7 +90,7 @@ enum VALUE_DATA_TYPE {
 
 
 
-#ifdef _DEBUG
+#ifdef DEBUG
 //extern int gRefCountValue;           // debugonly variable to check if all CValue Refences are Dereferenced at programexit
 #endif
 
@@ -251,7 +251,7 @@ public:
                // Increase global reference count, used to see at the end of the program
                // if all CValue-derived classes have been dereferenced to 0
                //debug(gRefCountValue++);
-#ifdef _DEBUG
+#ifdef DEBUG
                //gRefCountValue++;
 #endif
                m_refcount++; 
@@ -264,7 +264,7 @@ public:
                // Decrease global reference count, used to see at the end of the program
                // if all CValue-derived classes have been dereferenced to 0
                //debug(gRefCountValue--);
-#ifdef _DEBUG
+#ifdef DEBUG
                //gRefCountValue--;
 #endif
                // Decrease local reference count, if it reaches 0 the object should be freed
index 37c867ef7d655ffee95a4070fb82f66dce288976..566e556750722ae8dbe41dbb71ee976c507db546 100644 (file)
@@ -36,7 +36,7 @@
 #undef main
 #endif
 
-#ifndef _DEBUG
+#ifndef DEBUG
 #  define JOYSTICK_ECHO(x)
 #else
 #  include <iostream>