include/tools/diagnose_ex.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
New commits: commit 442555c97e8b6f9f547cf05c12b7d1ed79d9169e Author: Michael Stahl <[email protected]> Date: Thu Jan 28 17:39:18 2016 +0100 tools: replace BOOST_CURRENT_FUNCTION with OSL_THIS_FUNC Change-Id: I676ff9b8bdf5fc6b23090fd5914f983d0f11eb32 diff --git a/include/tools/diagnose_ex.h b/include/tools/diagnose_ex.h index 7dec15c..67c2421 100644 --- a/include/tools/diagnose_ex.h +++ b/include/tools/diagnose_ex.h @@ -44,7 +44,7 @@ TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any& caughtException, handling is not correct .... */ #define DBG_UNHANDLED_EXCEPTION() \ - DbgUnhandledException( ::cppu::getCaughtException(), BOOST_CURRENT_FUNCTION, SAL_DETAIL_WHERE); + DbgUnhandledException( ::cppu::getCaughtException(), OSL_THIS_FUNC, SAL_DETAIL_WHERE); #else // OSL_DEBUG_LEVEL #define DBG_UNHANDLED_EXCEPTION() @@ -56,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(BOOST_CURRENT_FUNCTION) \ + OUStringLiteral(OSL_THIS_FUNC) \ + ",\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(BOOST_CURRENT_FUNCTION) \ + OUStringLiteral(OSL_THIS_FUNC) \ + ",\n" m, \ ifc, \ arg ); } @@ -75,14 +75,14 @@ TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any& caughtException, if( !(c) ){ \ OSL_ENSURE(c, m); \ throw css::uno::RuntimeException( \ - OUStringLiteral(BOOST_CURRENT_FUNCTION) + ",\n" m, \ + OUStringLiteral(OSL_THIS_FUNC) + ",\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(BOOST_CURRENT_FUNCTION) + ",\n" m, \ + OUStringLiteral(OSL_THIS_FUNC) + ",\n" m, \ ifc ); } /** This macro asserts the given condition (in debug mode), and _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
