We require OS X SDK 10.8 or newer now
Change-Id: I68eee76c8710c89af8e3c1e1006345f908923ece
This commit is contained in:
@@ -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
|
||||
|
@@ -46,10 +46,8 @@ public:
|
||||
void testXsltCopyNew();
|
||||
|
||||
CPPUNIT_TEST_SUITE(XsltFilterTest);
|
||||
#if !(defined(MACOSX) && (MACOSX_SDK_VERSION < 1060))
|
||||
CPPUNIT_TEST(testXsltCopyOld);
|
||||
CPPUNIT_TEST(testXsltCopyNew);
|
||||
#endif
|
||||
CPPUNIT_TEST_SUITE_END();
|
||||
};
|
||||
|
||||
|
@@ -466,7 +466,7 @@ public:
|
||||
|
||||
CPPUNIT_TEST_SUITE(Test_osl_executeProcess);
|
||||
//TODO: Repair these (at least under Windows)
|
||||
#if !defined(WNT) && !(defined(MACOSX) && (MACOSX_SDK_VERSION < 1060))
|
||||
#if !defined(WNT)
|
||||
CPPUNIT_TEST(osl_execProc_parent_equals_child_environment);
|
||||
CPPUNIT_TEST(osl_execProc_merged_child_environment);
|
||||
#endif
|
||||
|
@@ -1246,11 +1246,7 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
|
||||
getAppleScrollBarVariant(aStyleSettings);
|
||||
|
||||
// set scrollbar size
|
||||
#if MACOSX_SDK_VERSION >= 1070
|
||||
aStyleSettings.SetScrollBarSize( static_cast<long int>([NSScroller scrollerWidthForControlSize:NSRegularControlSize scrollerStyle:NSScrollerStyleLegacy]) );
|
||||
#else
|
||||
aStyleSettings.SetScrollBarSize( static_cast<long int>([NSScroller scrollerWidth]) );
|
||||
#endif
|
||||
// images in menus false for MacOSX
|
||||
aStyleSettings.SetPreferredUseImagesInMenus( false );
|
||||
aStyleSettings.SetHideDisabledMenuItems( true );
|
||||
|
Reference in New Issue
Block a user