From e25a31eca8550780ce96586ef27063728441b2e2 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Mon, 2 Oct 2017 16:55:06 -0700
Subject: Suppress 4768 warning from shlobj.h

---
 toolsrc/include/pch.h | 7 +++++--
 toolsrc/src/vcpkg.cpp | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/toolsrc/include/pch.h b/toolsrc/include/pch.h
index 770bcf07a..0f34063f8 100644
--- a/toolsrc/include/pch.h
+++ b/toolsrc/include/pch.h
@@ -2,7 +2,7 @@
 
 #define NOMINMAX
 #define WIN32_LEAN_AND_MEAN
-
+#pragma warning(suppress : 4768)
 #include <windows.h>
 
 #include <algorithm>
@@ -28,7 +28,10 @@
 #include <regex>
 #include <set>
 #include <shellapi.h>
-#include <shlobj.h>
+#pragma warning(push)
+#pragma warning(disable : 4768)
+#include <Shlobj.h>
+#pragma warning(pop)
 #include <stdexcept>
 #include <string>
 #include <sys/timeb.h>
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp
index f4300a73c..706c641fb 100644
--- a/toolsrc/src/vcpkg.cpp
+++ b/toolsrc/src/vcpkg.cpp
@@ -11,7 +11,10 @@
 #include "vcpkg_Strings.h"
 #include "vcpkg_System.h"
 #include "vcpkglib.h"
+#pragma warning(push)
+#pragma warning(disable : 4768)
 #include <Shlobj.h>
+#pragma warning(pop)
 #include <cassert>
 #include <fstream>
 #include <memory>
-- 
cgit v1.2.3