diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-12-18 10:46:43 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-04-30 12:05:59 +0200 |
| commit | af0678cc00aff2e2d375bc34dc77b27e9a27cf6a (patch) | |
| tree | 54bb6cfaa85001d551e031c409d1569956cd6da8 /tools | |
| parent | fdb48192a1234482631f243a4b9ea77af52364ef (diff) | |
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.
(cherry picked from commit fc761cb2cc343c0c0f3ca8a908a547603a029e36)
Conflicts:
tools/source/debug/debug.cxx
Change-Id: I1f8bdb114b129fc4f39f186ba917e35e346a16b5
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/debug/debug.cxx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx index de4a14015044..fb2b0513c938 100644 --- a/tools/source/debug/debug.cxx +++ b/tools/source/debug/debug.cxx @@ -61,8 +61,6 @@ #include <cxxabi.h> #endif -#ifndef NDEBUG - struct DebugData { DbgTestSolarMutexProc pDbgTestSolarMutex; @@ -93,8 +91,6 @@ void DbgTestSolarMutex() aDebugData.pDbgTestSolarMutex(); } -#endif - static void exceptionToStringImpl(OStringBuffer& sMessage, const css::uno::Any & caught) { auto toOString = [](OUString const & s) { |