diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-10-01 10:55:14 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-10-01 17:27:59 +0300 |
| commit | ec147012340219c8bb5eaf8fe3d41be7836bc261 (patch) | |
| tree | fbe260f4edcfe3f587502ad5696decf789cd1b4b /bridges | |
| parent | 5e83f36cb5221172c76d4ab363d889f30ea70aed (diff) | |
We require OS X SDK 10.8 or newer now
Change-Id: I68eee76c8710c89af8e3c1e1006345f908923ece
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_ios_arm/except.cxx | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx index aa9cf6cb4e98..838743a51c1f 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx @@ -20,9 +20,6 @@ #include <typeinfo> #include <dlfcn.h> -#if defined(MACOSX) && MACOSX_SDK_VERSION < 1070 -#include <cxxabi.h> -#endif #include <boost/static_assert.hpp> #include <boost/unordered_map.hpp> @@ -58,31 +55,15 @@ BOOST_STATIC_ASSERT( struct Fake_class_type_info: Fake_type_info {}; -#if defined(MACOSX) && MACOSX_SDK_VERSION < 1070 -BOOST_STATIC_ASSERT( - sizeof (Fake_class_type_info) == sizeof (__cxxabiv1::__class_type_info)); -#endif - struct Fake_si_class_type_info: Fake_class_type_info { void const * base; }; -#if defined(MACOSX) && MACOSX_SDK_VERSION < 1070 -BOOST_STATIC_ASSERT( - sizeof (Fake_si_class_type_info) - == sizeof (__cxxabiv1::__si_class_type_info)); -#endif - struct Base {}; struct Derived: Base {}; std::type_info * createFake_class_type_info(char const * name) { char * buf = new char[sizeof (Fake_class_type_info)]; -#if defined(MACOSX) && MACOSX_SDK_VERSION < 1070 - assert( - dynamic_cast<__cxxabiv1::__class_type_info const *>(&typeid(Base)) - != 0); -#endif *reinterpret_cast<void **>(buf) = *reinterpret_cast<void * const *>( &typeid(Base)); // copy __cxxabiv1::__class_type_info vtable into place @@ -99,11 +80,6 @@ std::type_info * createFake_si_class_type_info( char const * name, std::type_info const * base) { char * buf = new char[sizeof (Fake_si_class_type_info)]; -#if defined(MACOSX) && MACOSX_SDK_VERSION < 1070 - assert( - dynamic_cast<__cxxabiv1::__si_class_type_info const *>(&typeid(Derived)) - != 0); -#endif *reinterpret_cast<void **>(buf) = *reinterpret_cast<void * const *>( &typeid(Derived)); // copy __cxxabiv1::__si_class_type_info vtable into place |