You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2020/12/02 03:27:07 UTC

[openoffice] branch trunk updated: We need this var

This is an automated email from the ASF dual-hosted git repository.

jim pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 69f2ccf  We need this var
69f2ccf is described below

commit 69f2ccfa9e97a7c1792bfba86fc6ebca4ddba1a0
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Tue Dec 1 22:26:11 2020 -0500

    We need this var
    
    (cherry picked from commit 8c98860170bdc93e0bb7d729da89e01fa7b572a3)
---
 main/bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno.cxx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno.cxx b/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno.cxx
index db311b5..4f6319d 100644
--- a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno.cxx
+++ b/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno.cxx
@@ -117,10 +117,7 @@ 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