[Boost-commit] svn:boost r80507 - trunk/libs/numeric/ublas/test

Subject: [Boost-commit] svn:boost r80507 - trunk/libs/numeric/ublas/test
From: guwi17_at_[hidden]
Date: 2012-09-12 15:53:33

Author: guwi17
Date: 2012-09-12 15:53:33 EDT (Wed, 12 Sep 2012)
New Revision: 80507
URL: http://svn.boost.org/trac/boost/changeset/80507

Log:

* libs/numeric/ublas/tests/utils.hpp: see #7296 - replace __func__ by __FUNCTION__ if compiled with MSVC

Text files modified: 
   trunk/libs/numeric/ublas/test/utils.hpp |     6 +++---                                  
   1 files changed, 3 insertions(+), 3 deletions(-)

Modified: trunk/libs/numeric/ublas/test/utils.hpp
==============================================================================
--- trunk/libs/numeric/ublas/test/utils.hpp	(original)
+++ trunk/libs/numeric/ublas/test/utils.hpp	2012-09-12 15:53:33 EDT (Wed, 12 Sep 2012)
@@ -376,10 +376,10 @@
                                                                                                                                 /* [/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