cppu/source/uno/check.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 653218c76a1b2c0da1963f9e09cadcbea56fecc3
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Sep 10 09:58:28 2018 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon Sep 10 12:58:24 2018 +0200
Fix for --enable-debug --disable-assert-always-abort
...found by <https://ci.libreoffice.org/job/lo_tb_random_config_linux/1465/>
Change-Id: Ia38fe5cac9fa187535599d313a3422c34458bcd9
Reviewed-on: https://gerrit.libreoffice.org/60242
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/cppu/source/uno/check.cxx b/cppu/source/uno/check.cxx
index e92d7616fa33..3dc0fc5aca0c 100644
--- a/cppu/source/uno/check.cxx
+++ b/cppu/source/uno/check.cxx
@@ -256,7 +256,7 @@ static_assert(sizeof(second) == sizeof(int),
"sizeof(second) != sizeof(int)");
# error unexpected alignment of 8 byte types
#endif
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG
#define OFFSET_OF( s, m ) reinterpret_cast< size_t >(reinterpret_cast<char
*>(&reinterpret_cast<s *>(16)->m) -16)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
