|
@@ -174,7 +174,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
* Used in code analysis to skip dead paths (e.g. after an assertion evaluated to false).
|
|
* Used in code analysis to skip dead paths (e.g. after an assertion evaluated to false).
|
|
*/
|
|
*/
|
|
#ifdef _MSC_VER
|
|
#ifdef _MSC_VER
|
|
- #pragma warning(disable : 4521 4512 4714 4127 4351 4510)
|
|
|
|
|
|
+ #pragma warning(disable : 4521 4512 4714 4127 4510)
|
|
|
|
+ #if _MSC_VER < 1900
|
|
|
|
+ #pragma warning(disable : 4351)
|
|
|
|
+ #endif
|
|
#ifdef ASSIMP_BUILD_DLL_EXPORT
|
|
#ifdef ASSIMP_BUILD_DLL_EXPORT
|
|
#pragma warning(disable : 4251)
|
|
#pragma warning(disable : 4251)
|
|
#endif
|
|
#endif
|