diff options
| author | Herbert Dürr <hdu@apache.org> | 2013-04-29 12:48:19 +0000 |
|---|---|---|
| committer | Herbert Dürr <hdu@apache.org> | 2013-04-29 12:48:19 +0000 |
| commit | 535877b8e31db23568277bf469b347230bd72730 (patch) | |
| tree | fa1fd0bb2bb3532be0dbeaf998a91d36d8f2b791 | |
| parent | 66cda06356401f2d3811452195168d46747efe22 (diff) | |
the BINTEST_VERIFYSIZE() macro was way too noisy
also unified the macro to work on all platforms
Notes
Notes:
prefer: 989bbfb35020c593a5b6412f36507d499d4dcb3f
| -rw-r--r-- | cppu/source/uno/data.cxx | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx index ee4169b3d333..b9a78dc2cea3 100644 --- a/cppu/source/uno/data.cxx +++ b/cppu/source/uno/data.cxx @@ -369,18 +369,8 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData( 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 |