Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r68927 - trunk/libs/config/test
From: chris_at_[hidden]
Date: 2011-02-15 15:41:57


Author: chrisj
Date: 2011-02-15 15:41:56 EST (Tue, 15 Feb 2011)
New Revision: 68927
URL: http://svn.boost.org/trac/boost/changeset/68927

Log:
libc++ declares a templated abs, which conflicts with the redefinition in math_info.cpp
Text files modified:
   trunk/libs/config/test/math_info.cpp | 3 ++-
   1 files changed, 2 insertions(+), 1 deletions(-)

Modified: trunk/libs/config/test/math_info.cpp
==============================================================================
--- trunk/libs/config/test/math_info.cpp (original)
+++ trunk/libs/config/test/math_info.cpp 2011-02-15 15:41:56 EST (Tue, 15 Feb 2011)
@@ -181,7 +181,8 @@
 // the floating point types or not:
 //
 namespace std{
-#if !BOOST_WORKAROUND(BOOST_MSVC, == 1300)
+#if !BOOST_WORKAROUND(BOOST_MSVC, == 1300) && \
+ !defined(_LIBCPP_VERSION)
 template <class T>
 char abs(T)
 {


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk