Enable c++17, this enables us to use std::filesystem

2 files changed, 5 insertions, 5 deletions

diff --git a/shell_integration/windows/OCContextMenu/OCClientInterface.cpp b/shell_integration/windows/OCContextMenu/OCClientInterface.cpp
index 899b372e1..5bf7d1255 100644
--- a/shell_integration/windows/OCContextMenu/OCClientInterface.cpp
+++ b/shell_integration/windows/OCContextMenu/OCClientInterface.cpp
@@ -28,11 +28,14 @@
 #include <iterator>
 #include <unordered_set>
 
-// use std::min in gdiplus
+// gdiplus min/max
+// don't use std yet, as gdiplus will cause issues
+using std::max;
+using std::min;
+#include <gdiplus.h>
 using namespace std;
 
 #include <comdef.h>
-#include <gdiplus.h>
 #include <wincrypt.h>
 #include <shlwapi.h>
 #include <wrl/client.h>
diff --git a/shell_integration/windows/OCContextMenu/dllmain.cpp b/shell_integration/windows/OCContextMenu/dllmain.cpp
index 9bc4c66af..1b5c86f18 100644
--- a/shell_integration/windows/OCContextMenu/dllmain.cpp
+++ b/shell_integration/windows/OCContextMenu/dllmain.cpp
@@ -17,10 +17,7 @@
 #include "OCContextMenuRegHandler.h"
 #include "OCContextMenuFactory.h"
 
-// gdiplus min/max
-using namespace std;
 #include <algorithm>
-#include <gdiplus.h>
 
 // {841A0AAD-AA11-4B50-84D9-7F8E727D77D7}
 static const GUID CLSID_FileContextMenuExt = { 0x841a0aad, 0xaa11, 0x4b50, { 0x84, 0xd9, 0x7f, 0x8e, 0x72, 0x7d, 0x77, 0xd7 } };