diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-04 04:53:57 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-04 04:53:57 +0400 |
| commit | 2921d48239da85b995c77980cc5bf91ea4a69c3e (patch) | |
| tree | bee3aef1fbcb90f94be0bda778a23cdc3f9c9ea8 /source/gameengine | |
| parent | 78351264195aeb2823470647526feaf404d16848 (diff) | |
code cleanup: unused vars in collada, preprocessor formatting & warning in mingw.
also compiling without bullet needed a stub added.
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Expressions/Value.h | 8 | ||||
| -rw-r--r-- | source/gameengine/GamePlayer/common/GPC_Canvas.h | 4 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp | 4 | ||||
| -rw-r--r-- | source/gameengine/Network/NG_NetworkScene.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/source/gameengine/Expressions/Value.h b/source/gameengine/Expressions/Value.h index c4af3255f4a..580691d88c4 100644 --- a/source/gameengine/Expressions/Value.h +++ b/source/gameengine/Expressions/Value.h @@ -253,9 +253,9 @@ 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 +#endif m_refcount++; return this; } @@ -266,9 +266,9 @@ 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 +#endif // Decrease local reference count, if it reaches 0 the object should be freed if (--m_refcount > 0) { diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.h b/source/gameengine/GamePlayer/common/GPC_Canvas.h index 00c5911a8b4..07f96166ec2 100644 --- a/source/gameengine/GamePlayer/common/GPC_Canvas.h +++ b/source/gameengine/GamePlayer/common/GPC_Canvas.h @@ -36,8 +36,8 @@ #include "RAS_Rect.h" #ifdef WIN32 - #pragma warning (disable:4786) // suppress stl-MSVC debug info warning - #include <windows.h> +# pragma warning (disable:4786) // suppress stl-MSVC debug info warning +# include <windows.h> #endif /* WIN32 */ #include "GL/glew.h" diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp index 4a5a1704979..ece6abc9447 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp @@ -68,8 +68,8 @@ extern "C"{ #include "KX_BulletPhysicsController.h" #include "btBulletDynamicsCommon.h" - #ifdef WIN32 -#if _MSC_VER >= 1310 +#ifdef WIN32 +#if defined(_MSC_VER) && (_MSC_VER >= 1310) //only use SIMD Hull code under Win32 //#define TEST_HULL 1 #ifdef TEST_HULL diff --git a/source/gameengine/Network/NG_NetworkScene.h b/source/gameengine/Network/NG_NetworkScene.h index 10dad210128..e6233852ee2 100644 --- a/source/gameengine/Network/NG_NetworkScene.h +++ b/source/gameengine/Network/NG_NetworkScene.h @@ -42,7 +42,7 @@ //MSVC defines SendMessage as a win api function, even though we aren't using it #ifdef SendMessage - #undef SendMessage +# undef SendMessage #endif using namespace std; |