[openoffice] branch AOO42X updated: It is better to move *into* a struct rather than *before* one.

[jim]

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

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


The following commit(s) were added to refs/heads/AOO42X by this push:
     new aa118bd  It is better to move *into* a struct rather than *before* one.
aa118bd is described below

commit aa118bd3b6209f0ce1307c244bc3c9f4edf445e4
Author: Jim Jagielski <jim...@gmail.com>
AuthorDate: Tue Dec 22 17:22:32 2020 -0500

    It is better to move *into* a struct rather than *before* one.
---
 main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx | 10 +++++-----
 main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx  |  2 +-
 main/vcl/aqua/source/app/salinst.cxx                       |  7 +++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx 
b/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx
index 2c4642d..723ce94 100644
--- a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx
+++ b/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx
@@ -156,7 +156,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription 
*pTypeDescr ) SAL_THR
         buf.append( 'E' );
         
         OString symName( buf.makeStringAndClear() );
-        rtti = reinterpret_cast<std::type_info *>(dlsym( m_hApp, 
symName.getStr() ));
+        rtti = static_cast<std::type_info *>(dlsym( m_hApp, symName.getStr() 
));
 
         if (rtti)
         {
@@ -311,11 +311,11 @@ void fillUnoException( __cxa_exception * header, uno_Any 
* pUnoExc, uno_Mapping
      * and that referenceCount is always >0 in the cases we handle
      */
     {
-        // Does this look like the struct __cxa_exception we were compiled w/?
+        // Does this look like the newer struct __cxa_exception?
         // That is, is the 1st element NULL (*reserved)?
-        if (*reinterpret_cast<void **>(header)) {
-            // Nope. it is pre llvm 10. So we back up a slot to offset
-            header = reinterpret_cast<__cxa_exception *>(reinterpret_cast<void 
**>(header) - 1);
+        if (*reinterpret_cast<void **>(header) == NULL) {
+            // Yes. So we move up a slot to offset
+            header = reinterpret_cast<__cxa_exception *>(reinterpret_cast<void 
**>(header) + 1);
         }
     }
 
diff --git a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx 
b/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx
index aa20c18..bed8a31 100644
--- a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx
+++ b/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx
@@ -52,7 +52,7 @@ struct __cxa_exception
     // https://reviews.llvm.org/rG674ec1eb16678b8addc02a4b0534ab383d22fa77
     // Sure would be nice to be able to test for CCNUMVER >= 1000000000
     // and COM == CLANG here.
-    void *reserved;
+    // void *reserved;
     // ----- from libcxxabi/src/cxa_exception.hpp
     // This is a new field to support C++ 0x exception_ptr.
     // For binary compatibility it is at the start of this
diff --git a/main/vcl/aqua/source/app/salinst.cxx 
b/main/vcl/aqua/source/app/salinst.cxx
index 4d27a87..cbbaf60 100644
--- a/main/vcl/aqua/source/app/salinst.cxx
+++ b/main/vcl/aqua/source/app/salinst.cxx
@@ -785,11 +785,10 @@ void AquaSalInstance::Yield( bool bWait, bool 
bHandleAllCurrentEvents )
     {
         // #i103162#
         // wait until any thread (most likely the main thread)
-        // has dispatched an event, cop out at 500 ms
-        sal_uLong nCount;
-        TimeValue aVal = { 0, 500000000 };
+        // has dispatched an event, cop out at 250 ms
+        TimeValue aVal = { 0, 250000000 };
         osl_resetCondition( maWaitingYieldCond );
-        nCount = ReleaseYieldMutex();
+        sal_uLong nCount = ReleaseYieldMutex();
         osl_waitCondition( maWaitingYieldCond, &aVal );
         AcquireYieldMutex( nCount );
     }