From 31b5be9f3858244204f66a15bd37c98ede1f11b6 Mon Sep 17 00:00:00 2001 From: walbourn_cp Date: Tue, 21 Jan 2014 12:50:14 -0800 Subject: [PATCH] Added comment explaining reason for supressing 4005 warning --- Src/ScreenGrab.cpp | 1 + Src/WICTextureLoader.cpp | 1 + Src/dds.h | 1 + Src/pch.h | 1 + 4 files changed, 4 insertions(+) diff --git a/Src/ScreenGrab.cpp b/Src/ScreenGrab.cpp index 33636de16..005e9bee5 100644 --- a/Src/ScreenGrab.cpp +++ b/Src/ScreenGrab.cpp @@ -29,6 +29,7 @@ #if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP) +// VS 2010's stdint.h conflicts with intsafe.h #pragma warning(push) #pragma warning(disable : 4005) #include diff --git a/Src/WICTextureLoader.cpp b/Src/WICTextureLoader.cpp index 1684543b5..19103027f 100644 --- a/Src/WICTextureLoader.cpp +++ b/Src/WICTextureLoader.cpp @@ -30,6 +30,7 @@ #include "pch.h" +// VS 2010's stdint.h conflicts with intsafe.h #pragma warning(push) #pragma warning(disable : 4005) #include diff --git a/Src/dds.h b/Src/dds.h index a40f9ac86..5ca1eba97 100644 --- a/Src/dds.h +++ b/Src/dds.h @@ -29,6 +29,7 @@ #include #endif +// VS 2010's stdint.h conflicts with intsafe.h #pragma warning(push) #pragma warning(disable : 4005) #include diff --git a/Src/pch.h b/Src/pch.h index 058887fb5..0f9f00f94 100644 --- a/Src/pch.h +++ b/Src/pch.h @@ -41,6 +41,7 @@ #include #include +// VS 2010's stdint.h conflicts with intsafe.h #pragma warning(push) #pragma warning(disable : 4005) #include