From 3f98bdb04b7991824f62690718712b232cb3438a Mon Sep 17 00:00:00 2001
From: lundberg <gregory_lundberg@gmx.com>
Date: Sun, 25 Mar 2018 20:13:21 -0500
Subject: [PATCH] Fix VC warnings about upstream issues

Disable some warnings pertaining to Boost issues such as name-hides-global.

(cherry-picked from commit a8539cfca0cfd5c79430f430b6f6256987e37c28)
---
 projectfiles/VC14/campaignd.vcxproj  | 1 +
 projectfiles/VC14/wesnoth.vcxproj    | 4 ++--
 projectfiles/VC14/wesnothd.vcxproj   | 2 +-
 projectfiles/VC14/wesnothlib.vcxproj | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/projectfiles/VC14/campaignd.vcxproj b/projectfiles/VC14/campaignd.vcxproj
index 4cc25deab31f..ad53da8ae5d5 100644
--- a/projectfiles/VC14/campaignd.vcxproj
+++ b/projectfiles/VC14/campaignd.vcxproj
@@ -115,6 +115,7 @@
     </ClCompile>
     <ClCompile Include="..\..\src\server\simple_wml.cpp">
       <ObjectFileName>$(IntDir)Server\</ObjectFileName>
+      <DisableSpecificWarnings>4458</DisableSpecificWarnings>
     </ClCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/projectfiles/VC14/wesnoth.vcxproj b/projectfiles/VC14/wesnoth.vcxproj
index deadac71280c..aeee7e5c124a 100644
--- a/projectfiles/VC14/wesnoth.vcxproj
+++ b/projectfiles/VC14/wesnoth.vcxproj
@@ -2884,7 +2884,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>
+      <DisableSpecificWarnings>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>
@@ -3370,7 +3370,7 @@
     <ClCompile Include="..\..\src\variable_info.cpp" />
     <ClCompile Include="..\..\src\video.cpp" />
     <ClCompile Include="..\..\src\wesnoth.cpp">
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
diff --git a/projectfiles/VC14/wesnothd.vcxproj b/projectfiles/VC14/wesnothd.vcxproj
index 082148c4ea74..751e2a8f093d 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;4458;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>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 705c6a1ec87c..9db4eb773699 100644
--- a/projectfiles/VC14/wesnothlib.vcxproj
+++ b/projectfiles/VC14/wesnothlib.vcxproj
@@ -145,17 +145,17 @@
     </ClCompile>
     <ClCompile Include="..\..\src\game_config.cpp" />
     <ClCompile Include="..\..\src\gettext_boost.cpp">
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4459;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4459;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <ClCompile Include="..\..\src\log.cpp" />
     <ClCompile Include="..\..\src\log_windows.cpp" />
     <ClCompile Include="..\..\src\random.cpp" />
     <ClCompile Include="..\..\src\serialization\base64.cpp" />
     <ClCompile Include="..\..\src\serialization\binary_or_text.cpp">
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <ClCompile Include="..\..\src\serialization\parser.cpp">
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <ClCompile Include="..\..\src\serialization\preprocessor.cpp" />
     <ClCompile Include="..\..\src\serialization\schema_validator.cpp" />