From 7a028461ed071dcfc08896ff5e2f7f25175fe7a2 Mon Sep 17 00:00:00 2001 From: Gunter Winkler Date: Wed, 12 Sep 2012 19:53:33 +0000 Subject: [PATCH] * libs/numeric/ublas/tests/utils.hpp: see #7296 - replace __func__ by __FUNCTION__ if compiled with MSVC [SVN r80507] --- test/utils.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/utils.hpp b/test/utils.hpp index 25d0ab4a..5a1fd531 100644 --- a/test/utils.hpp +++ b/test/utils.hpp @@ -376,10 +376,10 @@ bool rel_close_to(::std::complex const& x, ::std::complex const& y, T3 t /* [/BOOST_UBLAS_TEST_CHECK_MATRIX_REL_CLOSE] */ ///< Output the error message \a x. -#ifdef __func__ -# define BOOST_UBLAS_TEST_ERROR(x) ::std::cerr << "[Error (" << __FILE__ << ":" << __func__ << ":" << __LINE__ << ")>> " << BOOST_UBLAS_TEST_EXPAND_(x) << ::std::endl +#ifdef _MSC_VER +# define BOOST_UBLAS_TEST_ERROR(x) ::std::cerr << "[Error (" << __FILE__ << ":" << __FUNCTION__ << ":" << __LINE__ << ")>> " << BOOST_UBLAS_TEST_EXPAND_(x) << ::std::endl #else -# define BOOST_UBLAS_TEST_ERROR(x) ::std::cerr << "[Error (" << __FILE__ << ":" << __LINE__ << ")>> " << BOOST_UBLAS_TEST_EXPAND_(x) << ::std::endl +# define BOOST_UBLAS_TEST_ERROR(x) ::std::cerr << "[Error (" << __FILE__ << ":" << __func__ << ":" << __LINE__ << ")>> " << BOOST_UBLAS_TEST_EXPAND_(x) << ::std::endl #endif #endif // BOOST_NUMERIC_UBLAS_TEST_UTILS_HPP