summaryrefslogtreecommitdiffstats
path: root/bridges
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-09-18 11:00:59 +0200
committerStephan Bergmann <sbergman@redhat.com>2018-09-18 14:01:03 +0200
commit3a1aa1c2e7192fa3fa0e3fdca70ef4dd68e215e9 (patch)
tree01e87b33c052792281e77ee072ed390f26925714 /bridges
parenttdf#119929 ensure .ui translation domain is bound before translation attempt (diff)
downloadcore-3a1aa1c2e7192fa3fa0e3fdca70ef4dd68e215e9.tar.gz
core-3a1aa1c2e7192fa3fa0e3fdca70ef4dd68e215e9.zip
Fix for --enable-debug --disable-assert-always-abort
...found by <https://ci.libreoffice.org//job/lo_tb_random_config_linux/1480/> Change-Id: Ia71abc74122b9935344bfe693ba1556f6980c6de Reviewed-on: https://gerrit.libreoffice.org/60668 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'bridges')
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index b038a0247963..f0b2f815524c 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -317,7 +317,7 @@ void unoInterfaceProxyDispatch(
{
case typelib_TypeClass_INTERFACE_ATTRIBUTE:
{
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG
// determine vtable call index
sal_Int32 nMemberPos = reinterpret_cast<typelib_InterfaceMemberTypeDescription const *>(pMemberDescr)->nPosition;
assert(nMemberPos < pTypeDescr->nAllMembers);
@@ -366,7 +366,7 @@ void unoInterfaceProxyDispatch(
}
case typelib_TypeClass_INTERFACE_METHOD:
{
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG
// determine vtable call index
sal_Int32 nMemberPos = reinterpret_cast<typelib_InterfaceMemberTypeDescription const *>(pMemberDescr)->nPosition;
assert(nMemberPos < pTypeDescr->nAllMembers);