diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-02-10 07:43:08 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-02-10 07:43:08 +0000 |
| commit | d3298ad74ee5d5dfaa94b50ac4beb0c8f7e577c1 (patch) | |
| tree | 2115f74a96b4f4a502ae235ed1448908100dcb7b /include/exception | |
| parent | e1b6382ee31d987ba0af05c8cf586624745887ca (diff) | |
Revert "Split exception.cpp and new.cpp implementation into different files for different runtimes."
The compiler-rt CMake configuration needs some tweaking before this can land.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@294727 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/exception')
| -rw-r--r-- | include/exception | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/exception b/include/exception index db11c36d8..98e1f37f9 100644 --- a/include/exception +++ b/include/exception @@ -82,10 +82,6 @@ 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 @@ -93,7 +89,6 @@ 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: @@ -110,7 +105,6 @@ 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; |