summaryrefslogtreecommitdiffstats
path: root/libcxx/include/exception
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2017-02-10 04:25:33 +0000
committerEric Fiselier <eric@efcs.ca>2017-02-10 04:25:33 +0000
commitdef60acdf5ff7d5c8807bcf5382de2767e3a8819 (patch)
tree951b04a74001095c5c7f51255873fba8ff705ceb /libcxx/include/exception
parent982c5eb396a9a30b5dd17ac71fab9a9860317e85 (diff)
downloadbcm5719-llvm-def60acdf5ff7d5c8807bcf5382de2767e3a8819.tar.gz
bcm5719-llvm-def60acdf5ff7d5c8807bcf5382de2767e3a8819.zip
Split exception.cpp and new.cpp implementation into different files for different runtimes.
exception.cpp is a bloody mess. It's full of confusing #ifdef branches for each different ABI library we support, and it's getting unmaintainable. This patch breaks down exception.cpp into multiple different header files, roughly one per implementation. Additionally it moves the definitions of exceptions in new.cpp into the correct implementation header. This patch also removes an unmaintained libc++abi configuration. This configuration may still be used by Apple internally but there are no other possible users. If it turns out that Apple still uses this configuration internally I will re-add it in a later commit. See http://llvm.org/PR31904. llvm-svn: 294707
Diffstat (limited to 'libcxx/include/exception')
-rw-r--r--libcxx/include/exception6
1 files changed, 6 insertions, 0 deletions
diff --git a/libcxx/include/exception b/libcxx/include/exception
index 98e1f37f919..db11c36d806 100644
--- a/libcxx/include/exception
+++ b/libcxx/include/exception
@@ -82,6 +82,10 @@ template <class E> void rethrow_if_nested(const E& e);
#include <cstdlib>
#include <type_traits>
+#if defined(_LIBCPP_ABI_MICROSOFT)
+#include <vcruntime_exception.h>
+#endif
+
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
#endif
@@ -89,6 +93,7 @@ template <class E> void rethrow_if_nested(const E& e);
namespace std // purposefully not using versioning namespace
{
+#if !defined(_LIBCPP_ABI_MICROSOFT)
class _LIBCPP_EXCEPTION_ABI exception
{
public:
@@ -105,6 +110,7 @@ public:
virtual ~bad_exception() _NOEXCEPT;
virtual const char* what() const _NOEXCEPT;
};
+#endif // !_LIBCPP_ABI_MICROSOFT
typedef void (*unexpected_handler)();
_LIBCPP_FUNC_VIS unexpected_handler set_unexpected(unexpected_handler) _NOEXCEPT;
OpenPOWER on IntegriCloud