From 8d3dbe1fc0e714dca7df3770a6db15ece0cb8a8c 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 --- DirectXTex/DDS.h | 1 + DirectXTex/DirectXTex.h | 1 + DirectXTex/DirectXTexP.h | 1 + ScreenGrab/ScreenGrab.cpp | 1 + WICTextureLoader/WICTextureLoader.cpp | 1 + 5 files changed, 5 insertions(+) diff --git a/DirectXTex/DDS.h b/DirectXTex/DDS.h index 984b740..f3b9816 100644 --- a/DirectXTex/DDS.h +++ b/DirectXTex/DDS.h @@ -28,6 +28,7 @@ #include #endif +// VS 2010's stdint.h conflicts with intsafe.h #pragma warning(push) #pragma warning(disable : 4005) #include diff --git a/DirectXTex/DirectXTex.h b/DirectXTex/DirectXTex.h index b3f65b5..2fce943 100644 --- a/DirectXTex/DirectXTex.h +++ b/DirectXTex/DirectXTex.h @@ -17,6 +17,7 @@ #pragma once #endif +// VS 2010's stdint.h conflicts with intsafe.h #pragma warning(push) #pragma warning(disable : 4005) #include diff --git a/DirectXTex/DirectXTexP.h b/DirectXTex/DirectXTexP.h index c97cf45..73af860 100644 --- a/DirectXTex/DirectXTexP.h +++ b/DirectXTex/DirectXTexP.h @@ -35,6 +35,7 @@ #include "directxtex.h" +// VS 2010's stdint.h conflicts with intsafe.h #pragma warning(push) #pragma warning(disable : 4005) #include diff --git a/ScreenGrab/ScreenGrab.cpp b/ScreenGrab/ScreenGrab.cpp index 5208882..a3091ff 100644 --- a/ScreenGrab/ScreenGrab.cpp +++ b/ScreenGrab/ScreenGrab.cpp @@ -29,6 +29,7 @@ #include #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/WICTextureLoader/WICTextureLoader.cpp b/WICTextureLoader/WICTextureLoader.cpp index dc39f49..b76a889 100644 --- a/WICTextureLoader/WICTextureLoader.cpp +++ b/WICTextureLoader/WICTextureLoader.cpp @@ -31,6 +31,7 @@ #include #include +// VS 2010's stdint.h conflicts with intsafe.h #pragma warning(push) #pragma warning(disable : 4005) #include