summaryrefslogtreecommitdiffstats
path: root/llvm/unittests/Support/DynamicLibrary/PipSqueak.h
diff options
context:
space:
mode:
authorFrederich Munch <colsebas@hotmail.com>2017-06-05 16:26:58 +0000
committerFrederich Munch <colsebas@hotmail.com>2017-06-05 16:26:58 +0000
commitad12580012765c2c6580000688b5166de3b1587d (patch)
tree7dd0545d32a270089b1450c615a9e5b66d118f1d /llvm/unittests/Support/DynamicLibrary/PipSqueak.h
parentdb3b87b2c0b8f238c470e7c007fee0586c1d9a8e (diff)
downloadbcm5719-llvm-ad12580012765c2c6580000688b5166de3b1587d.tar.gz
bcm5719-llvm-ad12580012765c2c6580000688b5166de3b1587d.zip
Close DynamicLibraries in reverse order they were opened.
Summary: Matches C++ destruction ordering better and fixes possible problems of loaded libraries having inter-dependencies. Reviewers: efriedma, v.g.vassilev, chapuni Reviewed By: efriedma Subscribers: mgorny, llvm-commits Differential Revision: https://reviews.llvm.org/D33652 llvm-svn: 304720
Diffstat (limited to 'llvm/unittests/Support/DynamicLibrary/PipSqueak.h')
-rw-r--r--llvm/unittests/Support/DynamicLibrary/PipSqueak.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/llvm/unittests/Support/DynamicLibrary/PipSqueak.h b/llvm/unittests/Support/DynamicLibrary/PipSqueak.h
index e6a859d6071..3e4f79a9a6f 100644
--- a/llvm/unittests/Support/DynamicLibrary/PipSqueak.h
+++ b/llvm/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
OpenPOWER on IntegriCloud