From 7c709be65263f49e2855ab94b58af1836d15f6d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= <vaclav@slavik.io>
Date: Tue, 29 Mar 2016 18:54:58 +0200
Subject: [PATCH] Silence VC14 warning in d2d1helper.h system header

---
 src/msw/graphicsd2d.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/msw/graphicsd2d.cpp b/src/msw/graphicsd2d.cpp
index 81beb54ef9..49e2fa2471 100644
--- a/src/msw/graphicsd2d.cpp
+++ b/src/msw/graphicsd2d.cpp
@@ -30,6 +30,15 @@
 #define D2D1MakeRotateMatrix wxD2D1MakeRotateMatrix
 #define D2D1InvertMatrix wxD2D1InvertMatrix
 
+// There are clashes between the names of the member fields and parameters
+// in the standard d2d1helper.h header resulting in C4458 with VC14,
+// so disable this warning for this file as there is no other way to
+// avoid it.
+#ifdef __VISUALC__
+    #pragma warning(push)
+    #pragma warning(disable:4458) // declaration of 'xxx' hides class member
+#endif
+
 #include <d2d1.h>
 #include <dwrite.h>
 #include <wincodec.h>
@@ -40,6 +49,10 @@
 #include <DXGI1_2.h>
 #endif
 
+#ifdef __VISUALC__
+    #pragma warning(pop)
+#endif
+
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif