include/tools/diagnose_ex.h | 10 ++++------
tools/source/debug/debug.cxx | 9 +++------
2 files changed, 7 insertions(+), 12 deletions(-)
New commits:
commit 8ab005af961709b51398c523516fe61a54ca2131
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Sep 8 18:26:02 2015 +0300
Avoid pain when using selective debuginfo
Compile in the DbgUnhandledException function always.
Change-Id: I302954598e599e8db71967974b18ade54ca2de13
diff --git a/include/tools/diagnose_ex.h b/include/tools/diagnose_ex.h
index 1294615..7efffc6 100644
--- a/include/tools/diagnose_ex.h
+++ b/include/tools/diagnose_ex.h
@@ -27,10 +27,12 @@
#include <boost/current_function.hpp>
-#define OSL_UNUSED( expression ) \
- (void)(expression)
+#include <tools/toolsdllapi.h>
+#define OSL_UNUSED( expression ) \
+ (void)(expression)
+TOOLS_DLLPUBLIC void DbgUnhandledException(const ::com::sun::star::uno::Any&
caughtException, const char* currentFunction, const char* fileAndLineNo);
#if OSL_DEBUG_LEVEL > 0
#include <com/sun/star/configuration/CorruptedConfigurationException.hpp>
@@ -38,10 +40,6 @@
#include <osl/diagnose.h>
#include <osl/thread.h>
#include <boost/current_function.hpp>
- #include <typeinfo>
- #include <tools/toolsdllapi.h>
-
- TOOLS_DLLPUBLIC void DbgUnhandledException(const
::com::sun::star::uno::Any& caughtException, const char* currentFunction, const
char* fileAndLineNo);
/** reports a caught UNO exception via OSL diagnostics
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 1d1c8d6..4006b51 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -28,12 +28,15 @@
#include <string.h>
#include <stdio.h>
+#include <com/sun/star/configuration/CorruptedConfigurationException.hpp>
#include <com/sun/star/task/ErrorCodeIOException.hpp>
#include <tools/debug.hxx>
#include <rtl/string.h>
#include <sal/log.hxx>
#include <sal/macros.h>
+#include <osl/thread.h>
+#include <typeinfo>
#include <vector>
#include <osl/diagnose.h>
@@ -77,8 +80,6 @@ void* DbgFunc( sal_uInt16 nAction, void* pParam )
#endif
-#if OSL_DEBUG_LEVEL > 0
-
void DbgUnhandledException(const css::uno::Any & caught, const char*
currentFunction, const char* fileAndLineNo)
{
OString sMessage( "caught an exception!" );
@@ -124,8 +125,4 @@ void DbgUnhandledException(const css::uno::Any & caught,
const char* currentFunc
"legacy.osl", fileAndLineNo, "%s", sMessage.getStr());
}
-#endif
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
