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/typeinfo | |
| parent | 6677999e174b862eb17da64449bd04fba644e28f (diff) | |
| download | bcm5719-llvm-8dcdeaeb35500dd309cf2ff315dd829501798027.tar.gz bcm5719-llvm-8dcdeaeb35500dd309cf2ff315dd829501798027.zip | |
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/typeinfo')
| -rw-r--r-- | libcxx/include/typeinfo | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libcxx/include/typeinfo b/libcxx/include/typeinfo index 4145ac1a373..fdc25c81e94 100644 --- a/libcxx/include/typeinfo +++ b/libcxx/include/typeinfo @@ -69,9 +69,7 @@ public: #pragma GCC system_header #endif -#if defined(_LIBCPP_ABI_MICROSOFT) -#include <vcruntime_typeinfo.h> -#elif defined(_LIBCPP_NONUNIQUE_RTTI_BIT) +#if defined(_LIBCPP_NONUNIQUE_RTTI_BIT) #define _LIBCPP_HAS_NONUNIQUE_TYPEINFO #else #define _LIBCPP_HAS_UNIQUE_TYPEINFO @@ -80,7 +78,6 @@ public: namespace std // purposefully not using versioning namespace { -#if !defined(_LIBCPP_ABI_MICROSOFT) class _LIBCPP_EXCEPTION_ABI type_info { type_info& operator=(const type_info&); @@ -190,8 +187,6 @@ public: virtual const char* what() const _NOEXCEPT; }; -#endif // !_LIBCPP_ABI_MICROSOFT - } // std _LIBCPP_BEGIN_NAMESPACE_STD |
