[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - bridges/source

[Tor Lillqvist (via logerrit)]

 bridges/source/cpp_uno/gcc3_ios/cpp2uno-simulator.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 8c146f7d6894b3a56a11054e5c2a4ddb758cee86
Author:     Tor Lillqvist <t...@iki.fi>
AuthorDate: Tue Jul 16 14:11:09 2019 +0300
Commit:     Tor Lillqvist <t...@iki.fi>
CommitDate: Tue Jul 16 14:11:09 2019 +0300

    Fix build for iOS simulator
    
    Change-Id: Ia5a71b41848d4863836dcddb33a26f3bd0a5a576

diff --git a/bridges/source/cpp_uno/gcc3_ios/cpp2uno-simulator.cxx 
b/bridges/source/cpp_uno/gcc3_ios/cpp2uno-simulator.cxx
index d350d0c4c3e1..b8a8b582d688 100644
--- a/bridges/source/cpp_uno/gcc3_ios/cpp2uno-simulator.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios/cpp2uno-simulator.cxx
@@ -116,7 +116,12 @@ static typelib_TypeClass cpp2uno_call(
         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 ) ));
+
+#if OSL_DEBUG_LEVEL > 0
+            assert(bFitsRegisters);
+#endif
+
+            assert( ( nUsedSSE == 1 && nUsedGPR == 0 ) || ( nUsedSSE == 0 && 
nUsedGPR == 1 ) );
 
             if ( nUsedSSE == 1 )
             {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits