From: Frederich Munch <colsebas@hotmail.com>
Date: Thu, 27 Apr 2017 17:33:50 +0000 (+0000)
Subject: Fix warnings from test added in r301562 on Windows (when built without exceptions).
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6ceaa47580f401c49cd1514360cdc0bf46c5913;p=llvm

Fix warnings from test added in r301562 on Windows (when built without exceptions).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@301571 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/unittests/Support/DynamicLibrary/PipSqueak.cxx b/unittests/Support/DynamicLibrary/PipSqueak.cxx
index 1de85236a88..c54de6759dc 100644
--- a/unittests/Support/DynamicLibrary/PipSqueak.cxx
+++ b/unittests/Support/DynamicLibrary/PipSqueak.cxx
@@ -8,7 +8,17 @@
 //===----------------------------------------------------------------------===//
 
 #include "PipSqueak.h"
+
+#ifdef _WIN32
+// Disable warnings from inclusion of xlocale & exception
+#pragma warning(push)
+#pragma warning(disable: 4530)
+#pragma warning(disable: 4577)
+#include <string>
+#pragma warning(pop)
+#else
 #include <string>
+#endif
 
 struct Global {
   std::string *Str;