Subject: [Boost-commit] svn:boost r58410 - sandbox/chrono/boost/chrono
From: vicente.botet_at_[hidden]
Date: 2009-12-16 03:17:31
Author: viboes
Date: 2009-12-16 03:17:29 EST (Wed, 16 Dec 2009)
New Revision: 58410
URL: http://svn.boost.org/trac/boost/changeset/58410
Log:
Boost.Chrono: Version 0.2.4, Bug fixes
* Take care of Boost min/max recommendations
Text files modified:
sandbox/chrono/boost/chrono/chrono.hpp | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
Modified: sandbox/chrono/boost/chrono/chrono.hpp
==============================================================================
--- sandbox/chrono/boost/chrono/chrono.hpp (original)
+++ sandbox/chrono/boost/chrono/chrono.hpp 2009-12-16 03:17:29 EST (Wed, 16 Dec 2009)
@@ -447,8 +447,8 @@
static BOOST_CONSTEXPR Rep m_min_imp(boost::true_type) {return zero();}
public:
static BOOST_CONSTEXPR Rep zero() {return Rep(0);}
- static BOOST_CONSTEXPR Rep max() {return std::numeric_limits<Rep>::max();}
- static BOOST_CONSTEXPR Rep min() {return m_min_imp(boost::is_unsigned<Rep>());}
+ static BOOST_CONSTEXPR Rep max BOOST_PREVENT_MACRO_SUBSTITUTION () {return (std::numeric_limits<Rep>::max)();}
+ static BOOST_CONSTEXPR Rep min BOOST_PREVENT_MACRO_SUBSTITUTION () {return m_min_imp(boost::is_unsigned<Rep>());}
};
} // namespace chrono
@@ -560,8 +560,8 @@
// 20.9.3.4 duration special values [time.duration.special]
static BOOST_CONSTEXPR duration zero() {return duration(duration_values<rep>::zero());}
- static BOOST_CONSTEXPR duration min() {return duration(duration_values<rep>::min());}
- static BOOST_CONSTEXPR duration max() {return duration(duration_values<rep>::max());}
+ static BOOST_CONSTEXPR duration min BOOST_PREVENT_MACRO_SUBSTITUTION () {return duration((duration_values<rep>::min)());}
+ static BOOST_CONSTEXPR duration max BOOST_PREVENT_MACRO_SUBSTITUTION () {return duration((duration_values<rep>::max)());}
};
//----------------------------------------------------------------------------//
@@ -813,8 +813,8 @@
// special values
- static BOOST_CONSTEXPR time_point min() {return time_point(duration::min());}
- static BOOST_CONSTEXPR time_point max() {return time_point(duration::max());}
+ static BOOST_CONSTEXPR time_point min BOOST_PREVENT_MACRO_SUBSTITUTION () {return time_point((duration::min)());}
+ static BOOST_CONSTEXPR time_point max BOOST_PREVENT_MACRO_SUBSTITUTION () {return time_point((duration::max)());}
};
//----------------------------------------------------------------------------//