include/vcl/debugevent.hxx | 4 ----
vcl/source/window/debugevent.cxx | 4 ----
2 files changed, 8 deletions(-)
New commits:
commit 9ff8bdcd33cb93998eb7d6b151e310634b88bdfc
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Fri May 3 17:33:49 2019 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Fri May 3 21:36:53 2019 +0200
Compile the DebugEventInjector code always, not only when OSL_DEBUG_LEVEL > 0
Otherwise if you happen to compile vcl/source/app/svmain.cxx with
OSL_DEBUG_LEVEL > 0 but not this file, you get an undefined symbol
DebugEventInjector::getCreate().
In general I think our intent is that ideally it should be possible to
compile an arbitrary selection of source files with OSL_DEBUG_LEVEL=0,
and others with OSL_DEBUG_LEVEL=1. (For debugging functionality that
does require consistency across the codebase, we have DBG_UTIL.)
Note that DebugEventInjector::getCreate() will be called from
InitVCL() only when svmain.cxx is compiled with OSL_DEBUG_LEVEL > 0,
though. So for a "production" build with no debug compilation, this
change has no run-time effect.
Change-Id: I3411edfbbbaae21561363634e5eec5ac0cf53418
Reviewed-on: https://gerrit.libreoffice.org/71757
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/include/vcl/debugevent.hxx b/include/vcl/debugevent.hxx
index 32afcfc24737..fe0eefcce74a 100644
--- a/include/vcl/debugevent.hxx
+++ b/include/vcl/debugevent.hxx
@@ -10,8 +10,6 @@
#ifndef INCLUDED_VCL_DEBUGEVENT_HXX
#define INCLUDED_VCL_DEBUGEVENT_HXX
-#if OSL_DEBUG_LEVEL > 0
-
#include <vcl/dllapi.h>
#include <vcl/timer.hxx>
#include <sal/types.h>
@@ -33,8 +31,6 @@ class VCL_DLLPUBLIC DebugEventInjector : private Timer {
static DebugEventInjector *getCreate();
};
-#endif // OSL_DEBUG_LEVEL > 0
-
#endif // INCLUDED_VCL_DEBUGEVENT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/debugevent.cxx b/vcl/source/window/debugevent.cxx
index d7d5ec182f14..3aa8d062a0f2 100644
--- a/vcl/source/window/debugevent.cxx
+++ b/vcl/source/window/debugevent.cxx
@@ -20,8 +20,6 @@
#include <window.h>
#include <salwtype.hxx>
-#if OSL_DEBUG_LEVEL > 0
-
DebugEventInjector::DebugEventInjector( sal_uInt32 nMaxEvents) :
Timer("debug event injector")
, mnEventsLeft( nMaxEvents )
@@ -273,6 +271,4 @@ DebugEventInjector *DebugEventInjector::getCreate()
return nullptr;
}
-#endif // OSL_DEBUG_LEVEL > 0
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
