diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-10-15 06:15:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-15 06:15:07 +0400 |
| commit | 4d4664d98f49cfb171a43bd6ae6bb002b5f3c34b (patch) | |
| tree | e458f200b0061c4adec3a0d5b8f7f523b647c036 /source/gameengine/Ketsji/KX_GameObject.cpp | |
| parent | 977aaeb95c2946f2c8d83dd6a15979424a869eda (diff) | |
code cleanup: check for msvc directly when using warning pragma's.
Diffstat (limited to 'source/gameengine/Ketsji/KX_GameObject.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index 3cfb670d227..dfc8073303e 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -30,6 +30,11 @@ * \ingroup ketsji */ +#ifdef _MSC_VER + /* This warning tells us about truncation of __long__ stl-generated names. + * It can occasionally cause DevStudio to have internal compiler warnings. */ +# pragma warning( disable:4786 ) +#endif #if defined(_WIN64) && !defined(FREE_WINDOWS64) typedef unsigned __int64 uint_ptr; @@ -37,13 +42,6 @@ typedef unsigned __int64 uint_ptr; typedef unsigned long uint_ptr; #endif -#if defined(WIN32) && !defined(FREE_WINDOWS) -// This warning tells us about truncation of __long__ stl-generated names. -// It can occasionally cause DevStudio to have internal compiler warnings. -#pragma warning( disable : 4786 ) -#endif - - #define KX_INERTIA_INFINITE 10000 #include "RAS_IPolygonMaterial.h" #include "KX_BlenderMaterial.h" |