include/tools/debug.hxx | 6 +++---
tools/source/debug/debug.cxx | 4 ----
2 files changed, 3 insertions(+), 7 deletions(-)
New commits:
commit 522b68aa1c8a0d4720534ca4078cd669f7d7f867
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Dec 18 10:46:43 2019 +0100
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Wed Jan 1 16:12:32 2020 +0200
tools: define DbgTestSolarMutex() unconditionally
See the discussion at <https://gerrit.libreoffice.org/#/c/58170/>, and
this came up on IRC today again.
The above change broke the invariant that you can mix product and debug
(but not dbgutil) builds. Restore this, without mandating dbgutil for
the solar mutex assert code, which is useful for plain debug builds as
well.
Change-Id: I1f8bdb114b129fc4f39f186ba917e35e346a16b5
Reviewed-on: https://gerrit.libreoffice.org/85369
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/include/tools/debug.hxx b/include/tools/debug.hxx
index b66a9b2866ef..c72da4d06887 100644
--- a/include/tools/debug.hxx
+++ b/include/tools/debug.hxx
@@ -34,14 +34,14 @@
standard assert.
*/
-#ifndef NDEBUG
-// we want the solar mutex checking to be enabled in the assert-enabled builds
that the QA people use
-
typedef void (*DbgTestSolarMutexProc)();
TOOLS_DLLPUBLIC void DbgSetTestSolarMutex( DbgTestSolarMutexProc pParam );
TOOLS_DLLPUBLIC void DbgTestSolarMutex();
+#ifndef NDEBUG
+// we want the solar mutex checking to be enabled in the assert-enabled builds
that the QA people use
+
#define DBG_TESTSOLARMUTEX() \
do \
{ \
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 0691ee7a05a0..661e734b79b7 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -72,8 +72,6 @@
#include <cxxabi.h>
#endif
-#ifndef NDEBUG
-
struct DebugData
{
DbgTestSolarMutexProc pDbgTestSolarMutex;
@@ -104,8 +102,6 @@ void DbgTestSolarMutex()
aDebugData.pDbgTestSolarMutex();
}
-#endif
-
OString exceptionToString(const css::uno::Any & caught)
{
auto toOString = [](OUString const & s) {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
