Disable MSVC warnings on all MSVC
Fixes the build on MSVC 2017 (and probably MSVC 2015)
This commit is contained in:
@@ -321,9 +321,10 @@ public:
|
||||
struct Face : public FaceWithSmoothingGroup {
|
||||
};
|
||||
|
||||
#if _MSC_VER > 1920
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable : 4315)
|
||||
#endif
|
||||
#endif // _MSC_VER
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
/** Helper structure representing a texture */
|
||||
@@ -412,6 +413,10 @@ struct Texture {
|
||||
|
||||
#include <assimp/Compiler/poppack1.h>
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(pop)
|
||||
#endif // _MSC_VER
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
/** Helper structure representing a 3ds material */
|
||||
struct Material {
|
||||
|
||||
@@ -45,9 +45,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#include "AssetLib/Step/STEPFile.h"
|
||||
|
||||
#if _MSC_VER > 1920
|
||||
#ifdef _MSC_VER
|
||||
# pragma warning(push)
|
||||
# pragma warning( disable : 4512 )
|
||||
#endif // _WIN32
|
||||
#endif // _MSC_VER
|
||||
|
||||
namespace Assimp {
|
||||
namespace IFC {
|
||||
@@ -4372,4 +4373,8 @@ namespace STEP {
|
||||
} //! STEP
|
||||
} //! Assimp
|
||||
|
||||
#ifdef _MSC_VER
|
||||
# pragma warning(pop)
|
||||
#endif // _MSC_VER
|
||||
|
||||
#endif // INCLUDED_IFC_READER_GEN_H
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -68,9 +68,9 @@ namespace Assimp {
|
||||
namespace MDL {
|
||||
namespace HalfLife {
|
||||
|
||||
#if _MSC_VER > 1920
|
||||
#ifdef _MSC_VER
|
||||
# pragma warning(disable : 4706)
|
||||
#endif // _WIN32
|
||||
#endif // _MSC_VER
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
HL1MDLLoader::HL1MDLLoader(
|
||||
|
||||
@@ -54,10 +54,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#include <assimp/DefaultLogger.hpp>
|
||||
|
||||
#if _MSC_VER > 1920
|
||||
#ifdef _MSC_VER
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable : 4127 4456 4245 4512 )
|
||||
#endif // _WIN32
|
||||
#endif // _MSC_VER
|
||||
|
||||
//
|
||||
#if _MSC_VER > 1500 || (defined __GNUC___)
|
||||
@@ -960,9 +960,9 @@ private:
|
||||
const EXPRESS::ConversionSchema *schema;
|
||||
};
|
||||
|
||||
#if _MSC_VER > 1920
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(pop)
|
||||
#endif // _WIN32
|
||||
#endif // _MSC_VER
|
||||
|
||||
} // namespace STEP
|
||||
|
||||
|
||||
@@ -74,9 +74,9 @@ Here we implement only the C++ interface (Assimp::Exporter).
|
||||
|
||||
namespace Assimp {
|
||||
|
||||
#if _MSC_VER > 1920
|
||||
#ifdef _MSC_VER
|
||||
# pragma warning( disable : 4800 )
|
||||
#endif // _WIN32
|
||||
#endif // _MSC_VER
|
||||
|
||||
|
||||
// PostStepRegistry.cpp
|
||||
|
||||
@@ -53,9 +53,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
using namespace Assimp;
|
||||
void mydummy() {}
|
||||
|
||||
#if _MSC_VER > 1920
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(disable : 4709)
|
||||
#endif // _WIN32
|
||||
#endif // _MSC_VER
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
/** Subdivider stub class to implement the Catmull-Clarke subdivision algorithm. The
|
||||
* implementation is basing on recursive refinement. Directly evaluating the result is also
|
||||
|
||||
Reference in New Issue
Block a user