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/Rasterizer | |
| parent | 977aaeb95c2946f2c8d83dd6a15979424a869eda (diff) | |
code cleanup: check for msvc directly when using warning pragma's.
Diffstat (limited to 'source/gameengine/Rasterizer')
7 files changed, 17 insertions, 19 deletions
diff --git a/source/gameengine/Rasterizer/RAS_BucketManager.cpp b/source/gameengine/Rasterizer/RAS_BucketManager.cpp index 457fd0ad90c..3c49d6e5289 100644 --- a/source/gameengine/Rasterizer/RAS_BucketManager.cpp +++ b/source/gameengine/Rasterizer/RAS_BucketManager.cpp @@ -29,10 +29,9 @@ * \ingroup bgerast */ - -#if defined(WIN32) && !defined(FREE_WINDOWS) -// don't show these anoying STL warnings -#pragma warning (disable:4786) +#ifdef _MSC_VER + /* don't show these anoying STL warnings */ +# pragma warning (disable:4786) #endif #include "CTR_Map.h" diff --git a/source/gameengine/Rasterizer/RAS_Deformer.h b/source/gameengine/Rasterizer/RAS_Deformer.h index 6042a7dc4b5..058f2304f3d 100644 --- a/source/gameengine/Rasterizer/RAS_Deformer.h +++ b/source/gameengine/Rasterizer/RAS_Deformer.h @@ -32,9 +32,9 @@ #ifndef __RAS_DEFORMER_H__ #define __RAS_DEFORMER_H__ -#if defined(WIN32) && !defined(FREE_WINDOWS) -#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning -#endif /* WIN32 */ +#ifdef _MSC_VER +# pragma warning (disable:4786) /* get rid of stupid stl-visual compiler debug warning */ +#endif #include <stdlib.h> #include "CTR_Map.h" diff --git a/source/gameengine/Rasterizer/RAS_IRasterizer.h b/source/gameengine/Rasterizer/RAS_IRasterizer.h index f212b1e6e0b..e6948025999 100644 --- a/source/gameengine/Rasterizer/RAS_IRasterizer.h +++ b/source/gameengine/Rasterizer/RAS_IRasterizer.h @@ -32,8 +32,8 @@ #ifndef __RAS_IRASTERIZER_H__ #define __RAS_IRASTERIZER_H__ -#if defined(WIN32) && !defined(FREE_WINDOWS) -#pragma warning (disable:4786) +#ifdef _MSC_VER +# pragma warning (disable:4786) #endif #include "STR_HashedString.h" diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp index c890f0c3dc5..0cb6bc7439a 100644 --- a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp +++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp @@ -32,8 +32,8 @@ #include "RAS_MaterialBucket.h" -#if defined(WIN32) && !defined(FREE_WINDOWS) -#pragma warning (disable:4786) +#ifdef _MSC_VER +# pragma warning (disable:4786) #endif #ifdef WIN32 diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.h b/source/gameengine/Rasterizer/RAS_MeshObject.h index 99ed59f6057..281eae8734a 100644 --- a/source/gameengine/Rasterizer/RAS_MeshObject.h +++ b/source/gameengine/Rasterizer/RAS_MeshObject.h @@ -32,9 +32,9 @@ #ifndef __RAS_MESHOBJECT_H__ #define __RAS_MESHOBJECT_H__ -#if defined(WIN32) && !defined(FREE_WINDOWS) -// disable the STL warnings ("debug information length > 255") -#pragma warning (disable:4786) +#ifdef _MSC_VER + /* disable the STL warnings ("debug information length > 255") */ +# pragma warning (disable:4786) #endif #include <vector> diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h index e6d16378bcf..88bb0be531b 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h @@ -32,8 +32,8 @@ #ifndef __RAS_OPENGLRASTERIZER_H__ #define __RAS_OPENGLRASTERIZER_H__ -#if defined(WIN32) && !defined(FREE_WINDOWS) -#pragma warning (disable:4786) +#ifdef _MSC_VER +# pragma warning (disable:4786) #endif #include "MT_CmMatrix4x4.h" diff --git a/source/gameengine/Rasterizer/RAS_Polygon.cpp b/source/gameengine/Rasterizer/RAS_Polygon.cpp index a6912c0997d..f454d1c0204 100644 --- a/source/gameengine/Rasterizer/RAS_Polygon.cpp +++ b/source/gameengine/Rasterizer/RAS_Polygon.cpp @@ -29,9 +29,8 @@ * \ingroup bgerast */ - -#if defined(WIN32) && !defined(FREE_WINDOWS) -#pragma warning (disable:4786) +#ifdef _MSC_VER +# pragma warning (disable:4786) #endif #include "RAS_Polygon.h" |