bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 51f82a58a7c057d649ce5e2b3627e7ccf267fe84
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jan 28 20:27:41 2015 +0000
fix enable-assert-always-abort build
Change-Id: Icbab4d030877f978babfc51f984fb4793b60f681
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index ef6cdec..3903cda 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -110,14 +110,11 @@ static typelib_TypeClass cpp2uno_call(
int nUsedGPR = 0;
int nUsedSSE = 0;
-#if OSL_DEBUG_LEVEL > 0
- bool bFitsRegisters =
-#endif
- x86_64::examine_argument( rParam.pTypeRef, false, nUsedGPR,
nUsedSSE );
+ bool bFitsRegisters = x86_64::examine_argument( rParam.pTypeRef,
false, nUsedGPR, nUsedSSE );
if ( !rParam.bOut && bridges::cpp_uno::shared::isSimpleType(
rParam.pTypeRef ) ) // value
{
// Simple types must fit exactly one register on x86_64
- assert( bFitsRegisters && ( ( nUsedSSE == 1 && nUsedGPR == 0 ) ||
( nUsedSSE == 0 && nUsedGPR == 1 ) ) );
+ assert( bFitsRegisters && ( ( nUsedSSE == 1 && nUsedGPR == 0 ) ||
( nUsedSSE == 0 && nUsedGPR == 1 ) ) ); (void)bFitsRegisters;
if ( nUsedSSE == 1 )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
