From 5baac8121d8a0acbcff94476105f576e57b3f754 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Tue, 5 Dec 2017 14:04:26 -0800 Subject: [PATCH] Updated for VS 2017 (15.5) --- DirectXTex/DirectXTexP.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DirectXTex/DirectXTexP.h b/DirectXTex/DirectXTexP.h index 49836f48..4d5131b6 100644 --- a/DirectXTex/DirectXTexP.h +++ b/DirectXTex/DirectXTexP.h @@ -24,7 +24,7 @@ // C4640 construction of local static object is not thread-safe // Off by default warnings -#pragma warning(disable : 4061 4265 4365 4571 4623 4625 4626 4668 4710 4711 4746 4774 4820 4987 5026 5027 5031 5032) +#pragma warning(disable : 4061 4265 4365 4571 4623 4625 4626 4668 4710 4711 4746 4774 4820 4987 5026 5027 5031 5032 5039) // C4061 enumerator 'X' in switch of enum 'X' is not explicitly handled by a case label // C4265 class has virtual functions, but destructor is not virtual // C4365 signed/unsigned mismatch @@ -42,6 +42,7 @@ // C5026 move constructor was implicitly defined as deleted // C5027 move assignment operator was implicitly defined as deleted // C5031/5032 push/pop mismatches in windows headers +// C5039 pointer or reference to potentially throwing function passed to extern C function under - EHc // Windows 8.1 SDK related Off by default warnings #pragma warning(disable : 4471 4917 4986 5029)