From 5cae2802829179bd81aa3da83502cff42a51c494 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Fri, 30 Nov 2007 18:48:35 +0000 Subject: [PATCH] allow boost/current_function to be used again git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21882 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/support/debug.h | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/support/debug.h b/src/support/debug.h index ac22450384..47adf3f0a0 100644 --- a/src/support/debug.h +++ b/src/support/debug.h @@ -167,25 +167,17 @@ extern LyXErr lyxerr; } // namespace lyx -// stolen from boost/current_function.hpp -#if defined(__GNUC__) || (defined(__MWERKS__) && (__MWERKS__ >= 0x3000)) || (defined(__ICC) && (__ICC >= 600)) -# define CURRENT_FUNCTION __PRETTY_FUNCTION__ -#elif defined(__FUNCSIG__) -# define CURRENT_FUNCTION __FUNCSIG__ -#elif (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 600)) || (defined(__IBMCPP__) && (__IBMCPP__ >= 500)) -# define CURRENT_FUNCTION __FUNCTION__ -#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x550) -# define CURRENT_FUNCTION __FUNC__ -#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901) -# define CURRENT_FUNCTION __func__ +#if USE_BOOST_CURRENT_FUNCTION +# include +# define CURRENT_POSITION BOOST_CURRENT_FUNCTION ": " #else -# define CURRENT_FUNCTION "(unknown)" +# define CURRENT_POSITION __FILE__ << "(" << __LINE__ << "): " #endif #define LYXERR(type, msg) \ do { \ if (!lyx::lyxerr.debugging(type)) {} \ - else { lyx::lyxerr << CURRENT_FUNCTION <<": "<