From 3f2cf6da6f53f1969755dd26b92ab19719e6f00a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 27 Aug 2014 18:57:53 +1000 Subject: Cleanup: remove _DEBUG define usage --- source/blender/gpu/GPU_buffers.h | 8 ++++---- source/blender/imbuf/intern/openexr/openexr_api.cpp | 2 +- source/gameengine/Expressions/Expression.cpp | 4 ++-- source/gameengine/Expressions/Expression.h | 4 ++-- source/gameengine/Expressions/IntValue.cpp | 2 +- source/gameengine/Expressions/Value.cpp | 8 ++++---- source/gameengine/Expressions/Value.h | 6 +++--- source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) (limited to 'source') diff --git a/source/blender/gpu/GPU_buffers.h b/source/blender/gpu/GPU_buffers.h index 461995e37b5..ba461d5f8a2 100644 --- a/source/blender/gpu/GPU_buffers.h +++ b/source/blender/gpu/GPU_buffers.h @@ -32,11 +32,11 @@ #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; diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index b8b7d15bf28..ba1bda640a6 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -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) { } diff --git a/source/gameengine/Expressions/Expression.cpp b/source/gameengine/Expressions/Expression.cpp index c1146aaa65c..2428df977d3 100644 --- a/source/gameengine/Expressions/Expression.cpp +++ b/source/gameengine/Expressions/Expression.cpp @@ -21,13 +21,13 @@ ////////////////////////////////////////////////////////////////////// // Construction/Destruction ////////////////////////////////////////////////////////////////////// -#ifdef _DEBUG +#ifdef DEBUG //int gRefCountExpr; #endif CExpression::CExpression()// : m_cached_calculate(NULL) { m_refcount = 1; -#ifdef _DEBUG +#ifdef DEBUG //gRefCountExpr++; #endif } diff --git a/source/gameengine/Expressions/Expression.h b/source/gameengine/Expressions/Expression.h index d1b7eda43f0..9a4f1f93284 100644 --- a/source/gameengine/Expressions/Expression.h +++ b/source/gameengine/Expressions/Expression.h @@ -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) diff --git a/source/gameengine/Expressions/IntValue.cpp b/source/gameengine/Expressions/IntValue.cpp index a2d055974c3..82d2e94dbb0 100644 --- a/source/gameengine/Expressions/IntValue.cpp +++ b/source/gameengine/Expressions/IntValue.cpp @@ -35,7 +35,7 @@ effect: constructs a new CIntValue */ { -#ifdef _DEBUG_ +#ifdef DEBUG_ m_textval = "Int illegal constructor"; #endif m_pstrRep=NULL; diff --git a/source/gameengine/Expressions/Value.cpp b/source/gameengine/Expressions/Value.cpp index 1ced71e66a4..bdef2dbd5b0 100644 --- a/source/gameengine/Expressions/Value.cpp +++ b/source/gameengine/Expressions/Value.cpp @@ -86,7 +86,7 @@ struct SmartCValueRef std::vector 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(); diff --git a/source/gameengine/Expressions/Value.h b/source/gameengine/Expressions/Value.h index 7f6ce9aa703..c7e9a40a059 100644 --- a/source/gameengine/Expressions/Value.h +++ b/source/gameengine/Expressions/Value.h @@ -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 diff --git a/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h b/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h index 37c867ef7d6..566e5567507 100644 --- a/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h +++ b/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h @@ -36,7 +36,7 @@ #undef main #endif -#ifndef _DEBUG +#ifndef DEBUG # define JOYSTICK_ECHO(x) #else # include -- cgit v1.2.3