summaryrefslogtreecommitdiffstats
path: root/llvm/unittests/Support/DynamicLibrary
diff options
context:
space:
mode:
authorFrederich Munch <colsebas@hotmail.com>2017-04-27 17:33:50 +0000
committerFrederich Munch <colsebas@hotmail.com>2017-04-27 17:33:50 +0000
commitd0c0700f92126ed8de1d89c1d730644f3e206218 (patch)
treef31928ae808b4f1f7857795738c2417c42043ad5 /llvm/unittests/Support/DynamicLibrary
parent96d6ca7e8c4f6bce55134c2fca66fb9747ecfde8 (diff)
downloadbcm5719-llvm-d0c0700f92126ed8de1d89c1d730644f3e206218.tar.gz
bcm5719-llvm-d0c0700f92126ed8de1d89c1d730644f3e206218.zip
Fix warnings from test added in r301562 on Windows (when built without exceptions).
llvm-svn: 301571
Diffstat (limited to 'llvm/unittests/Support/DynamicLibrary')
-rw-r--r--llvm/unittests/Support/DynamicLibrary/PipSqueak.cxx10
1 files changed, 10 insertions, 0 deletions
diff --git a/llvm/unittests/Support/DynamicLibrary/PipSqueak.cxx b/llvm/unittests/Support/DynamicLibrary/PipSqueak.cxx
index 1de85236a88..c54de6759dc 100644
--- a/llvm/unittests/Support/DynamicLibrary/PipSqueak.cxx
+++ b/llvm/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;
OpenPOWER on IntegriCloud