diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-06-10 13:44:06 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-06-10 13:44:06 +0000 |
| commit | 7ab83427af0f77b59941ceba41d509d7d097b065 (patch) | |
| tree | cc41c05b1db454e3d802f34df75e636ee922ad87 /unittests/Support/DynamicLibrary/PipSqueak.h | |
| parent | d288ef4c1788d3a951a7558c68312c2d320612b1 (diff) | |
Diffstat (limited to 'unittests/Support/DynamicLibrary/PipSqueak.h')
| -rw-r--r-- | unittests/Support/DynamicLibrary/PipSqueak.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/unittests/Support/DynamicLibrary/PipSqueak.h b/unittests/Support/DynamicLibrary/PipSqueak.h index e6a859d60716..3e4f79a9a6f4 100644 --- a/unittests/Support/DynamicLibrary/PipSqueak.h +++ b/unittests/Support/DynamicLibrary/PipSqueak.h @@ -10,6 +10,19 @@ #ifndef LLVM_PIPSQUEAK_H #define LLVM_PIPSQUEAK_H +#if defined(_WIN32) && !defined(__GNUC__) +// Disable warnings from inclusion of xlocale & exception +#pragma warning(push) +#pragma warning(disable: 4530) +#pragma warning(disable: 4577) +#include <string> +#include <vector> +#pragma warning(pop) +#else +#include <string> +#include <vector> +#endif + #ifdef _WIN32 #define PIPSQUEAK_EXPORT __declspec(dllexport) #else |