From c04d542e554a8bc2e452e0ebb9dfff8acddfdda2 Mon Sep 17 00:00:00 2001
From: lundberg <gregory_lundberg@gmx.com>
Date: Mon, 19 Mar 2018 11:14:10 -0500
Subject: [PATCH] Suppress upstream variable-hide-variable errors.

(cherry-picked from commit c187f069e8d0133976b3e0dafaecad2af09a8ed0)
---
 projectfiles/VC14/wesnoth.vcxproj    | 1 +
 projectfiles/VC14/wesnothd.vcxproj   | 2 +-
 projectfiles/VC14/wesnothlib.vcxproj | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/projectfiles/VC14/wesnoth.vcxproj b/projectfiles/VC14/wesnoth.vcxproj
index 381c0df453ee..5c405f0faafd 100644
--- a/projectfiles/VC14/wesnoth.vcxproj
+++ b/projectfiles/VC14/wesnoth.vcxproj
@@ -2890,6 +2890,7 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Terrain\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\src\terrain\translation.cpp">
+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4459;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Terrain\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Terrain\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Terrain\</ObjectFileName>
diff --git a/projectfiles/VC14/wesnothd.vcxproj b/projectfiles/VC14/wesnothd.vcxproj
index 66d8614ae8f0..70cc3cd82d36 100644
--- a/projectfiles/VC14/wesnothd.vcxproj
+++ b/projectfiles/VC14/wesnothd.vcxproj
@@ -222,7 +222,7 @@
     </ClCompile>
     <ClCompile Include="..\..\src\server\simple_wml.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Server\</ObjectFileName>
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4706;4458;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Server\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Server\</ObjectFileName>
     </ClCompile>
diff --git a/projectfiles/VC14/wesnothlib.vcxproj b/projectfiles/VC14/wesnothlib.vcxproj
index f9fec160ce65..f2610fa8a660 100644
--- a/projectfiles/VC14/wesnothlib.vcxproj
+++ b/projectfiles/VC14/wesnothlib.vcxproj
@@ -144,7 +144,9 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Formula\</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\src\game_config.cpp" />
-    <ClCompile Include="..\..\src\gettext_boost.cpp" />
+    <ClCompile Include="..\..\src\gettext_boost.cpp">
+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4459;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
     <ClCompile Include="..\..\src\log.cpp" />
     <ClCompile Include="..\..\src\log_windows.cpp" />
     <ClCompile Include="..\..\src\random.cpp" />