diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-01-28 20:27:41 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-28 20:28:03 +0000 |
| commit | 51f82a58a7c057d649ce5e2b3627e7ccf267fe84 (patch) | |
| tree | e44e4267a9a3b677533ad2441138d35bfcb86d01 /bridges | |
| parent | bec15074ae8eca9ff7deb795aae0e7a2f9789aaf (diff) | |
fix enable-assert-always-abort build
Change-Id: Icbab4d030877f978babfc51f984fb4793b60f681
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
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 ef6cdec8e700..3903cdadfd4d 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 ) { |