Suppress 4768 warning from shlobj.h

microsoft · Oct 3, 2017 · e25a31e · e25a31e
1 parent f72cf87
commit e25a31e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -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>