Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8219FD159 for ; Thu, 27 Sep 2012 17:45:56 +0000 (UTC) Received: (qmail 82176 invoked by uid 500); 27 Sep 2012 17:45:56 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 82120 invoked by uid 500); 27 Sep 2012 17:45:56 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 82112 invoked by uid 99); 27 Sep 2012 17:45:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Sep 2012 17:45:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Sep 2012 17:45:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2FF4723889ED; Thu, 27 Sep 2012 17:45:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1391138 - /incubator/ooo/trunk/main/cppu/source/uno/data.cxx Date: Thu, 27 Sep 2012 17:45:10 -0000 To: ooo-commits@incubator.apache.org From: paveljanik@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120927174510.2FF4723889ED@eris.apache.org> Author: paveljanik Date: Thu Sep 27 17:45:09 2012 New Revision: 1391138 URL: http://svn.apache.org/viewvc?rev=1391138&view=rev Log: Use proper print format modifier for sizeof() - can be long on some platforms. Modified: incubator/ooo/trunk/main/cppu/source/uno/data.cxx Modified: incubator/ooo/trunk/main/cppu/source/uno/data.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/cppu/source/uno/data.cxx?rev=1391138&r1=1391137&r2=1391138&view=diff ============================================================================== --- incubator/ooo/trunk/main/cppu/source/uno/data.cxx (original) +++ incubator/ooo/trunk/main/cppu/source/uno/data.cxx Thu Sep 27 17:45:09 2012 @@ -366,7 +366,7 @@ sal_Bool SAL_CALL uno_type_isAssignableF #define BINTEST_VERIFY( c ) \ if (! (c)) { fprintf( stderr, "### binary compatibility test failed: %s [line %d]!!!\n", #c, __LINE__ ); abort(); } #define BINTEST_VERIFYOFFSET( s, m, n ) \ - 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), n ); abort(); } + 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(n) ); abort(); } #if OSL_DEBUG_LEVEL > 1 #if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && (defined(INTEL) || defined(POWERPC) || defined(X86_64) || defined(S390)) @@ -375,8 +375,8 @@ sal_Bool SAL_CALL uno_type_isAssignableF 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 ") = %d\n", sizeof(s) ); \ - if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", sizeof(s), n ); abort(); } + 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 ) \