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 | 8dcdeaeb35500dd309cf2ff315dd829501798027 (patch) | |
| tree | 71a024602be7d4b685780ed3c3f8e3fdda26b6bb /libcxx/include/exception | |
| parent | 6677999e174b862eb17da64449bd04fba644e28f (diff) | |
| download | llvm-8dcdeaeb35500dd309cf2ff315dd829501798027.zip llvm-8dcdeaeb35500dd309cf2ff315dd829501798027.tar.gz llvm-8dcdeaeb35500dd309cf2ff315dd829501798027.tar.bz2 | |
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.
llvm-svn: 294727
Diffstat (limited to 'libcxx/include/exception')
| -rw-r--r-- | libcxx/include/exception | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libcxx/include/exception b/libcxx/include/exception index db11c36..98e1f37 100644 --- a/libcxx/include/exception +++ b/libcxx/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; |