From 8c3f6e38a45144d5d206b58ee62388fd162b1efd Mon Sep 17 00:00:00 2001 From: Frederich Munch Date: Thu, 27 Apr 2017 17:33:50 +0000 Subject: [PATCH] Fix warnings from test added in r301562 on Windows (when built without exceptions). llvm-svn: 301571 --- unittests/Support/DynamicLibrary/PipSqueak.cxx | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 +#pragma warning(pop) +#else +#include +#endif struct Global { std::string *Str;