include/tools/debug.hxx | 6 +++--- tools/source/debug/debug.cxx | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-)
New commits: commit fc761cb2cc343c0c0f3ca8a908a547603a029e36 Author: Miklos Vajna <[email protected]> AuthorDate: Wed Dec 18 10:46:43 2019 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Wed Dec 18 15:04:12 2019 +0100 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 <[email protected]> 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 a410b6feeaa9..7d39fdecac58 100644 --- a/tools/source/debug/debug.cxx +++ b/tools/source/debug/debug.cxx @@ -61,8 +61,6 @@ #include <cxxabi.h> #endif -#ifndef NDEBUG - namespace { struct DebugData @@ -97,8 +95,6 @@ void DbgTestSolarMutex() aDebugData.pDbgTestSolarMutex(); } -#endif - static void exceptionToStringImpl(OStringBuffer& sMessage, const css::uno::Any & caught) { auto toOString = [](OUString const & s) { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
