From 31dfbb68d50e7bcd056b72487b651b129d02f76a Mon Sep 17 00:00:00 2001
From: codereader <greebo@angua.at>
Date: Mon, 6 Apr 2020 07:47:59 +0200
Subject: [PATCH] #5174: Silence a VC++ warning about wstring_convert being
 deprecated. Add inclusion guard to header.

---
 libs/string/encoding.h                       | 2 ++
 tools/msvc/properties/DarkRadiant Base.props | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libs/string/encoding.h b/libs/string/encoding.h
index 654b1810ad..a082678115 100644
--- a/libs/string/encoding.h
+++ b/libs/string/encoding.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include <string>
 #include <codecvt>
 #include <locale>
diff --git a/tools/msvc/properties/DarkRadiant Base.props b/tools/msvc/properties/DarkRadiant Base.props
index 2046ffe857..be274b66b6 100644
--- a/tools/msvc/properties/DarkRadiant Base.props	
+++ b/tools/msvc/properties/DarkRadiant Base.props	
@@ -13,7 +13,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(DarkRadiantRoot)\include;$(DarkRadiantRoot)\libs;$(W32DepsDir)libsigc++\include;$(DarkRadiantRoot)\libs\libfmt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;FMT_HEADER_ONLY;FMT_USE_WINDOWS_H=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;FMT_HEADER_ONLY;FMT_USE_WINDOWS_H=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ConformanceMode>true</ConformanceMode>