v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix new vs2013 warnings.

pull/3012/head
Kim Kulling 2020-03-18 21:32:17 +01:00
parent 097d2faeea
commit 9aa5e3e04f
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/FBX/FBXTokenizer.h
View File

@ -48,6 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "FBXCompileConfig.h" #include "FBXCompileConfig.h"
#include <assimp/ai_assert.h> #include <assimp/ai_assert.h>
#include <assimp/defs.h>
#include <vector> #include <vector>
#include <string> #include <string>

4
code/M3D/m3d.h
View File

@ -101,9 +101,9 @@ typedef uint16_t M3D_INDEX;
#ifdef _WIN32 #ifdef _WIN32
# pragma warning(push) # pragma warning(push)
# pragma warning(disable : 4127 4505 4244 4403 5744 4701 4703) # pragma warning(disable : 4100 4127 4189 4505 4244 4403 4701 4703)
# if (_MSC_VER > 1800 ) # if (_MSC_VER > 1800 )
# pragma warning(disable : 5573 ) # pragma warning(disable : 5573 5744)
# endif # endif
#endif // _WIN32 #endif // _WIN32

1
contrib/Open3DGC/o3dgcArithmeticCodec.h
View File

@ -75,6 +75,7 @@ OF SUCH DAMAGE.
#include <stdio.h> #include <stdio.h>
#include "o3dgcCommon.h" #include "o3dgcCommon.h"
#include <assimp/defs.h>
namespace o3dgc namespace o3dgc
{ {

2
include/assimp/defs.h
View File

@ -158,7 +158,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#endif #endif
#ifdef _MSC_VER #ifdef _MSC_VER
# pragma warning(disable : 4521 4512 4714 4127) # pragma warning(disable : 4521 4512 4714 4127 4351 4510 )
# ifdef ASSIMP_BUILD_DLL_EXPORT # ifdef ASSIMP_BUILD_DLL_EXPORT
# pragma warning (disable : 4251) # pragma warning (disable : 4251)
# endif # endif