[Libreoffice-commits] core.git: cppuhelper/source

[Tor Lillqvist (via logerrit)]

 cppuhelper/source/exc_thrower.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 24d94f9a1507d24b71276f879d8353996ebe55dc
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Aug 7 06:58:27 2020 +0100
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Aug 7 13:32:12 2020 +0200

    Use the lo_mobile_throwException() thing on macOS on arm64 for now
    
    Change-Id: I58720d25c4838f1f4ee79a2586a61cc7d03ef853
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100281
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx
index 7c40d12db16e..2963572e4770 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -173,7 +173,7 @@ ExceptionThrower::ExceptionThrower()
 
 class theExceptionThrower : public rtl::Static<ExceptionThrower, theExceptionThrower> {};
 
-#if defined(IOS) || (defined(__aarch64__) && defined(ANDROID))
+#if defined(IOS) || (defined(__aarch64__) && (defined(ANDROID) || defined(MACOSX)))
 // In the native iOS / Android app, where we don't have any Java, Python,
 // BASIC, or other scripting, the only thing that would use the C++/UNO bridge
 // functionality that invokes codeSnippet() was cppu::throwException().
@@ -211,7 +211,7 @@ void lo_mobile_throwException(css::uno::Any const& aException)
 
     assert(false);
 }
-#endif // defined(IOS) || (defined(__aarch64__) && defined(ANDROID))
+#endif // defined(IOS) || (defined(__aarch64__) && (defined(ANDROID) || defined(MACOSX)))
 
 } // anonymous namespace
 
@@ -229,7 +229,7 @@ void SAL_CALL throwException( Any const & exc )
             "(must be derived from com::sun::star::uno::Exception)!" );
     }
 
-#if defined(IOS) || (defined(__aarch64__) && defined(ANDROID))
+#if defined(IOS) || (defined(__aarch64__) && (defined(ANDROID) || defined(MACOSX)))
     lo_mobile_throwException(exc);
 #else
     Mapping uno2cpp(Environment(UNO_LB_UNO), Environment::getCurrent());