From a60b45f4819a030379213f659c7b20658895e6b9 Mon Sep 17 00:00:00 2001
From: Kojin <kojin@protonmail.com>
Date: Thu, 24 Sep 2020 06:39:30 -0400
Subject: [PATCH] msbuild: update project to cpp17 (#3745)

---
 common/vsprops/BaseProperties.props | 1 +
 common/vsprops/CommonLibrary.props  | 1 +
 plugins/GSdx/vsprops/common.props   | 1 +
 plugins/USBnull/USB.cpp             | 5 ++---
 plugins/dev9null/DEV9.cpp           | 5 ++---
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/vsprops/BaseProperties.props b/common/vsprops/BaseProperties.props
index bbc3dcee96..6d1d4628ce 100644
--- a/common/vsprops/BaseProperties.props
+++ b/common/vsprops/BaseProperties.props
@@ -19,6 +19,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>4063;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/common/vsprops/CommonLibrary.props b/common/vsprops/CommonLibrary.props
index 750d3e8c30..2f3759273b 100644
--- a/common/vsprops/CommonLibrary.props
+++ b/common/vsprops/CommonLibrary.props
@@ -22,6 +22,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <DisableSpecificWarnings>4063;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/plugins/GSdx/vsprops/common.props b/plugins/GSdx/vsprops/common.props
index 1b6ecbc89d..ba3370d682 100644
--- a/plugins/GSdx/vsprops/common.props
+++ b/plugins/GSdx/vsprops/common.props
@@ -16,6 +16,7 @@
       <AdditionalIncludeDirectories>$(VTUNE_AMPLIFIER_XE_2015_DIR)include;$(ProjectDir);$(SolutionDir)common\include;$(SolutionDir)3rdparty\baseclasses;$(SolutionDir)3rdparty;$(SolutionDir)3rdparty\freetype\include;$(SolutionDir)3rdparty\libpng;$(SolutionDir)3rdparty\xz\xz\src\liblzma\api;$(SolutionDir)3rdparty\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PreprocessorDefinitions>LZMA_API_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <AdditionalDependencies>d3dcompiler.lib;d3d11.lib;dxgi.lib;dxguid.lib;winmm.lib;strmiids.lib;opengl32.lib;comsuppw.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/plugins/USBnull/USB.cpp b/plugins/USBnull/USB.cpp
index a86dbb7180..69b4ba126f 100644
--- a/plugins/USBnull/USB.cpp
+++ b/plugins/USBnull/USB.cpp
@@ -15,13 +15,12 @@
 
 #include <stdlib.h>
 #include <string>
-using namespace std;
 #include "svnrev.h"
 #include "USB.h"
 #include "null/config.inl"
 
-string s_strIniPath = "inis";
-string s_strLogPath = "logs";
+std::string s_strIniPath = "inis";
+std::string s_strLogPath = "logs";
 
 const unsigned char version = PS2E_USB_VERSION;
 const unsigned char revision = 0;
diff --git a/plugins/dev9null/DEV9.cpp b/plugins/dev9null/DEV9.cpp
index e39f32e4c0..ec77d2d318 100644
--- a/plugins/dev9null/DEV9.cpp
+++ b/plugins/dev9null/DEV9.cpp
@@ -28,7 +28,6 @@
 #include <string.h>
 #include <errno.h>
 #include <string>
-using namespace std;
 
 #include "DEV9.h"
 #include "svnrev.h"
@@ -45,8 +44,8 @@ void (*DEV9irq)(int);
 
 __aligned16 s8 dev9regs[0x10000];
 
-string s_strIniPath = "inis";
-string s_strLogPath = "logs";
+std::string s_strIniPath = "inis";
+std::string s_strLogPath = "logs";
 
 EXPORT_C_(void)
 DEV9configure()