diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-02-20 20:27:23 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-02-21 12:26:18 +0100 |
| commit | 4b0c46dc61df243cda94f4a0af8946e076d1af54 (patch) | |
| tree | 24902beabce2f959cf0154972a36fabe6b13d235 /bridges | |
| parent | f1a780cb6b7b860856de7ce2d8735432523c9e73 (diff) | |
ofz#66731 Crash in com::sun::star::uno::BaseReference::iquery
since
commit f93ae0455c4d515be1ca663725a6e58d64a7e393
Date: Sat Feb 3 18:03:45 2024 +0100
Check bridges with IWYU
presumably not using the _LIBCPPABI_VERSION branch
move the _GLIBCXX_CDTOR_CALLABI fallback define to where
its used while I'm at it, that too seems to be from cxxabi.h
Change-Id: I2ead7207e3bcf24d3b120d22ae7f80e8f0a3216a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163672
Tested-by: Jenkins
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx | 4 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx index ed62f404f439..d17f3d99c629 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx @@ -28,7 +28,9 @@ #include "rtti.hxx" #include "share.hxx" -#include <cxxabi.h> +#ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h +#define _GLIBCXX_CDTOR_CALLABI +#endif using namespace ::std; using namespace ::com::sun::star::uno; diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx index 6752eeaf6c3d..76d031b29a49 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx @@ -22,9 +22,7 @@ #include <typeinfo> #include <exception> -#ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h -#define _GLIBCXX_CDTOR_CALLABI -#endif +#include <cxxabi.h> // we need this here for _LIBCPPABI_VERSION, etc #include <unwind.h> #include <config_cxxabi.h> |