mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge with the main branch

metadata
Wenzel Jakob 2010-11-22 08:30:14 +01:00
parent 804c7ca718 9ffca1b6b9
commit cc8761db46
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/mitsuba/core/platform.h
View File

@ -27,6 +27,9 @@
#ifdef _SECURE_SCL_THROWS #ifdef _SECURE_SCL_THROWS
#undef _SECURE_SCL_THROWS #undef _SECURE_SCL_THROWS
#endif #endif
#ifdef _SCL_SECURE_NO_WARNINGS
#undef _SCL_SECURE_NO_WARNINGS
#endif
#ifdef _HAS_ITERATOR_DEBUGGING #ifdef _HAS_ITERATOR_DEBUGGING
#undef _HAS_ITERATOR_DEBUGGING #undef _HAS_ITERATOR_DEBUGGING
#endif #endif
@ -34,6 +37,7 @@
#define _SECURE_SCL_THROWS 0 #define _SECURE_SCL_THROWS 0
#define _HAS_ITERATOR_DEBUGGING 0 #define _HAS_ITERATOR_DEBUGGING 0
#define _SCL_SECURE_NO_WARNINGS 0
#define __MSVC__ #define __MSVC__
#define __WINDOWS__ #define __WINDOWS__
@ -49,6 +53,7 @@
#pragma warning(disable : 4251) // 'field' : class 'A' needs to have dll-interface to be used by clients of class 'B' #pragma warning(disable : 4251) // 'field' : class 'A' needs to have dll-interface to be used by clients of class 'B'
#pragma warning(disable : 4800) // 'type' : forcing value to bool 'true' or 'false' (performance warning) #pragma warning(disable : 4800) // 'type' : forcing value to bool 'true' or 'false' (performance warning)
#pragma warning(disable : 4996) // Secure SCL warnings
#include <stdint_msvc.h> // Does not exist in MSVC. Use a replacement #include <stdint_msvc.h> // Does not exist in MSVC. Use a replacement
#if _MSC_VER >= 1400 #if _MSC_VER >= 1400
#include <memory.h> #include <memory.h>