From 097d2faeea89345a8544f186223ff473f7ce769f Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 18 Mar 2020 19:31:30 +0100 Subject: [PATCH] fix vs2013 specific warnings. --- code/Common/Exporter.cpp | 7 +++++-- code/Common/Subdivision.cpp | 3 +++ code/M3D/m3d.h | 5 ++++- code/MDL/HalfLife/HL1MDLLoader.cpp | 4 ++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/code/Common/Exporter.cpp b/code/Common/Exporter.cpp index 9f9a33b58..66bb921d7 100644 --- a/code/Common/Exporter.cpp +++ b/code/Common/Exporter.cpp @@ -5,8 +5,6 @@ Open Asset Import Library (assimp) Copyright (c) 2006-2020, assimp team - - All rights reserved. Redistribution and use of this software in source and binary forms, @@ -76,6 +74,11 @@ Here we implement only the C++ interface (Assimp::Exporter). namespace Assimp { +#ifdef _WIN32 +# pragma warning( disable : 4800 ) +#endif // _WIN32 + + // PostStepRegistry.cpp void GetPostProcessingStepInstanceList(std::vector< BaseProcess* >& out); diff --git a/code/Common/Subdivision.cpp b/code/Common/Subdivision.cpp index 08408f867..2b376695e 100644 --- a/code/Common/Subdivision.cpp +++ b/code/Common/Subdivision.cpp @@ -53,6 +53,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. using namespace Assimp; void mydummy() {} +#ifdef _WIN32 +# pragma warning( disable : 4709 ) +#endif // _WIN32 // ------------------------------------------------------------------------------------------------ /** Subdivider stub class to implement the Catmull-Clarke subdivision algorithm. The * implementation is basing on recursive refinement. Directly evaluating the result is also diff --git a/code/M3D/m3d.h b/code/M3D/m3d.h index 86574d58c..8f7d367fe 100644 --- a/code/M3D/m3d.h +++ b/code/M3D/m3d.h @@ -101,7 +101,10 @@ typedef uint16_t M3D_INDEX; #ifdef _WIN32 # pragma warning(push) -# pragma warning(disable : 4127 5573 4505 4244 4403 5744 4701 4703) +# pragma warning(disable : 4127 4505 4244 4403 5744 4701 4703) +# if (_MSC_VER > 1800 ) +# pragma warning(disable : 5573 ) +# endif #endif // _WIN32 /*** File format structures ***/ diff --git a/code/MDL/HalfLife/HL1MDLLoader.cpp b/code/MDL/HalfLife/HL1MDLLoader.cpp index 0abb47bce..bc23862eb 100644 --- a/code/MDL/HalfLife/HL1MDLLoader.cpp +++ b/code/MDL/HalfLife/HL1MDLLoader.cpp @@ -68,6 +68,10 @@ namespace Assimp { namespace MDL { namespace HalfLife { +#ifdef _WIN32 +# pragma warning(disabe : 4706) +#endif // _WIN32 + // ------------------------------------------------------------------------------------------------ HL1MDLLoader::HL1MDLLoader( aiScene *scene,