[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/codemaker-function-template-generators.diff |   26 +------------
 1 file changed, 2 insertions(+), 24 deletions(-)

New commits:
commit a69eee404dc841d9d699d2c940f78e97c805f3d5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 14 12:15:11 2009 +0300

    Adapt codemaker-function-template-generators.diff for dev300-m54
    
    * patches/dev300/codemaker-function-template-generators.diff: Adapt
      for dev300-m54.

diff --git a/patches/dev300/codemaker-function-template-generators.diff b/patches/dev300/codemaker-function-template-generators.diff
index 451fda1..b6688dd 100644
--- a/patches/dev300/codemaker-function-template-generators.diff
+++ b/patches/dev300/codemaker-function-template-generators.diff
@@ -70,28 +70,6 @@ index 69fa71a..5da6316 100644
  	o << "#ifdef SAL_W32\n"
  	  << "#   pragma pack(pop)\n"
  	  << "#elif defined(SAL_OS2)\n"
-diff --git a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx b/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
-index 2d5e638..94f8569 100644
---- codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
-+++ codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
-@@ -444,10 +444,16 @@ 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));
- 
--#if defined __GNUC__ && __GNUC__ >= 3
-+#if defined(__GNUC__) && __GNUC__ >= 3
-+# if !defined(X86_64)
-     CPPUNIT_ASSERT_EQUAL(
-         static_cast< std::size_t >(16),
-         sizeof (test::codemaker::cppumaker::AlignmentDerivedStruct));
-+# else
-+    CPPUNIT_ASSERT_EQUAL(
-+        static_cast< std::size_t >(24),
-+        sizeof (test::codemaker::cppumaker::AlignmentDerivedStruct));
-+# endif
- #endif
-     
-     com::sun::star::uno::Type t(
 diff --git a/codemaker/test/cppumaker/types.idl b/codemaker/test/cppumaker/types.idl
 index 972f579..962aca8 100644
 --- codemaker/test/cppumaker/types.idl
@@ -100,8 +78,8 @@ index 972f579..962aca8 100644
   *
   ************************************************************************/
  
--//TODO: Do not depend on types for which C++ header files are only generated
--// later in the build process in offuh:
+-/*TODO: Do not depend on types for which C++ header files are only generated
+-  later in the build process in offuh: */
  #include "com/sun/star/lang/ClassNotFoundException.idl"
  #include "com/sun/star/lang/IllegalAccessException.idl"
  #include "com/sun/star/lang/Locale.idl"