Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r83866 - in branches/release: boost/chrono boost/chrono/detail boost/chrono/io boost/chrono/io_v1 libs/chrono/example libs/chrono/src libs/chrono/test libs/chrono/test/clock libs/chrono/test/duration libs/chrono/test/io libs/chrono/test/time_point libs/chrono/test/traits
From: vicente.botet_at_[hidden]
Date: 2013-04-13 08:56:31


Author: viboes
Date: 2013-04-13 08:56:31 EDT (Sat, 13 Apr 2013)
New Revision: 83866
URL: http://svn.boost.org/trac/boost/changeset/83866

Log:
Chrono: merge to fix #8367.
Properties modified:
   branches/release/boost/chrono/detail/ (props changed)
   branches/release/boost/chrono/io/ (props changed)
   branches/release/boost/chrono/io_v1/ (props changed)
   branches/release/libs/chrono/example/ (props changed)
   branches/release/libs/chrono/src/ (props changed)
   branches/release/libs/chrono/test/clock/ (props changed)
   branches/release/libs/chrono/test/duration/ (props changed)
   branches/release/libs/chrono/test/io/ (props changed)
   branches/release/libs/chrono/test/time_point/ (props changed)
   branches/release/libs/chrono/test/traits/ (props changed)
   branches/release/libs/chrono/test/win32_test.cpp (props changed)
Text files modified:
   branches/release/boost/chrono/config.hpp | 2 +-
   1 files changed, 1 insertions(+), 1 deletions(-)

Modified: branches/release/boost/chrono/config.hpp
==============================================================================
--- branches/release/boost/chrono/config.hpp (original)
+++ branches/release/boost/chrono/config.hpp 2013-04-13 08:56:31 EDT (Sat, 13 Apr 2013)
@@ -126,7 +126,7 @@
 
 #if defined( BOOST_NO_CXX11_NUMERIC_LIMITS )
 #define BOOST_CHRONO_LIB_CONSTEXPR
-#elif defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 1002
+#elif defined(_LIBCPP_VERSION) && !defined(_LIBCPP_CONSTEXPR)
   #define BOOST_CHRONO_LIB_CONSTEXPR
 #else
   #define BOOST_CHRONO_LIB_CONSTEXPR BOOST_CONSTEXPR


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