Author: hdu
Date: Mon Apr 29 13:48:19 2013
New Revision: 1477076
URL: http://svn.apache.org/r1477076
Log:
the BINTEST_VERIFYSIZE() macro was way too noisy
also unified the macro to work on all platforms
Modified:
openoffice/trunk/main/cppu/source/uno/data.cxx
Modified: openoffice/trunk/main/cppu/source/uno/data.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/cppu/source/uno/data.cxx?rev=1477076&r1=1477075&r2=1477076&view=diff
==============================================================================
--- openoffice/trunk/main/cppu/source/uno/data.cxx (original)
+++ openoffice/trunk/main/cppu/source/uno/data.cxx Mon Apr 29 13:48:19 2013
@@ -369,18 +369,8 @@ sal_Bool SAL_CALL uno_type_isAssignableF
if (OFFSET_OF(s, m) != n) { fprintf( stderr, "### OFFSET_OF(" #s ", " #m
") = %" SAL_PRI_SIZET "u instead of expected %d!!!\n", OFFSET_OF(s, m),
static_cast<int>(n) ); abort(); }
#if OSL_DEBUG_LEVEL > 1
-#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) &&
(defined(INTEL) || defined(POWERPC) || defined(X86_64) || defined(S390))
#define BINTEST_VERIFYSIZE( s, n ) \
- fprintf( stderr, "> sizeof(" #s ") = %d; __alignof__ (" #s ") = %d\n",
sizeof(s), __alignof__ (s) ); \
- if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of
expected %d!!!\n", sizeof(s), n ); abort(); }
-#else // ! GNUC
-#define BINTEST_VERIFYSIZE( s, n ) \
- fprintf( stderr, "> sizeof(" #s ") = %" SAL_PRI_SIZET "d\n", sizeof(s) ); \
- if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %"
SAL_PRI_SIZET "d instead of expected %d!!!\n", sizeof(s), n ); abort(); }
-#endif
-#else // ! OSL_DEBUG_LEVEL
-#define BINTEST_VERIFYSIZE( s, n ) \
- if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of
expected %d!!!\n", sizeof(s), n ); abort(); }
+ if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of
expected %d!!!\n", (int)sizeof(s), n ); abort(); }
#endif
struct C1
