[llvm] r301571 - Fix warnings from test added in r301562 on Windows (when built without exceptions).

[Frederich Munch via llvm-commits]

Author: marsupial
Date: Thu Apr 27 12:33:50 2017
New Revision: 301571

URL: http://llvm.org/viewvc/llvm-project?rev=301571&view=rev
Log:
Fix warnings from test added in r301562 on Windows (when built without exceptions).

Modified:
    llvm/trunk/unittests/Support/DynamicLibrary/PipSqueak.cxx

Modified: llvm/trunk/unittests/Support/DynamicLibrary/PipSqueak.cxx
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/DynamicLibrary/PipSqueak.cxx?rev=301571&r1=301570&r2=301571&view=diff
==============================================================================
--- llvm/trunk/unittests/Support/DynamicLibrary/PipSqueak.cxx (original)
+++ llvm/trunk/unittests/Support/DynamicLibrary/PipSqueak.cxx Thu Apr 27 12:33:50 2017
@@ -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;