diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-01-28 11:33:04 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-01-28 11:34:10 +0100 |
| commit | 863e1f0035430316d2b52c667737905a07875438 (patch) | |
| tree | 0520f27e377c9349632e577ce252f8f57a560385 /include/tools | |
| parent | 10303054067258016fbbae018ea848f74adc4964 (diff) | |
Revert "canvas: replace BOOST_CURRENT_FUNCTION with __func__"
This reverts commit d01f7db4b5f51d1be8ba210625f4ad1ebf5c6e8f.
Revert "tools: replace BOOST_CURRENT_FUNCTION with __func__"
This reverts commit 10303054067258016fbbae018ea848f74adc4964.
Surprisingly MSVC 2013 does not support __func__ - need 2015.
Change-Id: I7084d7b79784b34a8f40fb986d10ffefbabae7fb
Diffstat (limited to 'include/tools')
| -rw-r--r-- | include/tools/diagnose_ex.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/tools/diagnose_ex.h b/include/tools/diagnose_ex.h index 4ece912363a0..7dec15c6f0a3 100644 --- a/include/tools/diagnose_ex.h +++ b/include/tools/diagnose_ex.h @@ -36,6 +36,7 @@ TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any& caughtException, #include <cppuhelper/exc_hlp.hxx> #include <osl/diagnose.h> #include <osl/thread.h> + #include <boost/current_function.hpp> /** reports a caught UNO exception via OSL diagnostics @@ -43,7 +44,7 @@ TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any& caughtException, handling is not correct .... */ #define DBG_UNHANDLED_EXCEPTION() \ - DbgUnhandledException( ::cppu::getCaughtException(), __func__, SAL_DETAIL_WHERE); + DbgUnhandledException( ::cppu::getCaughtException(), BOOST_CURRENT_FUNCTION, SAL_DETAIL_WHERE); #else // OSL_DEBUG_LEVEL #define DBG_UNHANDLED_EXCEPTION() @@ -55,14 +56,14 @@ TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any& caughtException, #define ENSURE_ARG_OR_THROW(c, m) if( !(c) ) { \ OSL_ENSURE(c, m); \ throw css::lang::IllegalArgumentException( \ - OUStringLiteral(__func__) \ + OUStringLiteral(BOOST_CURRENT_FUNCTION) \ + ",\n" m, \ css::uno::Reference< css::uno::XInterface >(), \ 0 ); } #define ENSURE_ARG_OR_THROW2(c, m, ifc, arg) if( !(c) ) { \ OSL_ENSURE(c, m); \ throw css::lang::IllegalArgumentException( \ - OUStringLiteral(__func__) \ + OUStringLiteral(BOOST_CURRENT_FUNCTION) \ + ",\n" m, \ ifc, \ arg ); } @@ -74,14 +75,14 @@ TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any& caughtException, if( !(c) ){ \ OSL_ENSURE(c, m); \ throw css::uno::RuntimeException( \ - OUStringLiteral(__func__) + ",\n" m, \ + OUStringLiteral(BOOST_CURRENT_FUNCTION) + ",\n" m, \ css::uno::Reference< css::uno::XInterface >() ); } #define ENSURE_OR_THROW2(c, m, ifc) \ if( !(c) ) { \ OSL_ENSURE(c, m); \ throw css::uno::RuntimeException( \ - OUStringLiteral(__func__) + ",\n" m, \ + OUStringLiteral(BOOST_CURRENT_FUNCTION) + ",\n" m, \ ifc ); } /** This macro asserts the given condition (in debug mode), and |