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

[Libreoffice Gerrit user]

 bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3a1aa1c2e7192fa3fa0e3fdca70ef4dd68e215e9
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Sep 18 11:00:59 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Sep 18 14:01:03 2018 +0200

    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 at redhat.com>

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);