diff options
| author | Tor Lillqvist <tml@collabora.com> | 2020-08-07 06:58:27 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2020-08-07 13:32:12 +0200 |
| commit | 24d94f9a1507d24b71276f879d8353996ebe55dc (patch) | |
| tree | 56600586d74517a447f6a1e63f0003e47178ee55 /cppuhelper | |
| parent | d54264e34c1ccc0eaf4178ab165a843028500223 (diff) | |
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@collabora.com>
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/exc_thrower.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
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()); |