Changeset 881Tweet

Timestamp:

Aug 30, 2011, 6:51:09 PM (9 years ago)

Author:

sam

Message:

contrib: rebuild the Win32 CppUnit under Linux and fix the includes.

Apparently g++ 4.5.2 on native mingw32 inserts references to Unwind_Resume
when exceptions are supported. This function is not present in the g++ 4.4
cross-compiler found in Debian, leading to linker errors when cross-
compiling. So we use the latter to build CppUnit itself.

Another problem arises with g++ 4.4, which is the incomplete stripping of
exceptions when -fno-exceptions is used. Since ExceptionTestCaseDecorator.h
has such code, we protect it with #ifdef EXCEPTIONS in the meantime.

Location:

trunk

Files:

• contrib/cppunit-1.12.2/include/cppunit/extensions/ExceptionTestCaseDecorator.h (modified) (1 diff)
• contrib/cppunit-1.12.2/lib/libcppunit.a (modified) (previous)
• test/lol-bench.cpp (modified) (1 diff)

trunk/contrib/cppunit-1.12.2/include/cppunit/extensions/ExceptionTestCaseDecorator.h

@@ -71 +71 @@
     catch ( ExpectedExceptionType &e )
     {
+#if defined __EXCEPTIONS // lol begin
       checkException( e );
+#endif // lol end
       return;
     }

trunk/test/lol-bench.cpp

@@ -138 +138 @@
             break;
         }
-#if defined __EXCEPTIONS
-#error lol
-#endif
 
         /* Copy float */