diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 16:13:58 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 16:13:58 +0100 |
| commit | 88d7b9b03fa77231a139d8cf183ffaae16666eee (patch) | |
| tree | 00ae843905f2edff5712eefcb69170b0c68fae09 /cppu | |
| parent | a3a19632f413a6fe8dee97f02d637e7197869b50 (diff) | |
| parent | a4632bb6a212a67d0e1e0b1c887ec1cbe30c1cf8 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/ure
Conflicts:
sal/qa/rtl/math/rtl_math.cxx
sal/qa/rtl/math/test_rtl_math.cxx
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/qa/cppumaker/test_cppumaker.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx index 833ab6ba551b..821142a77700 100644 --- a/cppu/qa/cppumaker/test_cppumaker.cxx +++ b/cppu/qa/cppumaker/test_cppumaker.cxx @@ -444,15 +444,18 @@ void Test::testBigStruct() { CPPUNIT_ASSERT_EQUAL(guard.p->m22.getLength(), static_cast< sal_Int32 >(0)); CPPUNIT_ASSERT_EQUAL(guard.p->m23.getLength(), static_cast< sal_Int32 >(0)); +//This is a very platform specific test. #if defined __GNUC__ && __GNUC__ >= 3 // see CPPU_GCC3_ALIGN +#if defined(LINUX) && (defined (X86_64) || defined(X86) || defined(PPC)) CPPUNIT_ASSERT_EQUAL( -#if defined X86_64 +#if defined X86_64 || defined PPC static_cast< std::size_t >(24), #else static_cast< std::size_t >(16), #endif sizeof (test::codemaker::cppumaker::AlignmentDerivedStruct)); #endif +#endif com::sun::star::uno::Type t( cppu::UnoType< test::codemaker::cppumaker::BigStruct >::get()); |