Subject: [Boost-commit] svn:boost r84621 - in branches/release: boost/chrono boost/chrono/detail boost/chrono/io boost/chrono/io_v1 libs/chrono/doc 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-06-03 12:48:42
Author: viboes
Date: 2013-06-03 12:48:42 EDT (Mon, 03 Jun 2013)
New Revision: 84621
URL: http://svn.boost.org/trac/boost/changeset/84621
Log:
Chrono: merge [84411] to fix #8604.
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/duration.hpp | 8 ++++----
branches/release/libs/chrono/doc/chrono.qbk | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
Modified: branches/release/boost/chrono/duration.hpp
==============================================================================
--- branches/release/boost/chrono/duration.hpp (original)
+++ branches/release/boost/chrono/duration.hpp 2013-06-03 12:48:42 EDT (Mon, 03 Jun 2013)
@@ -663,7 +663,7 @@
template <class LhsDuration, class RhsDuration>
struct duration_eq
{
- BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const RhsDuration& rhs)
+ BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const RhsDuration& rhs) const
{
typedef typename common_type<LhsDuration, RhsDuration>::type CD;
return CD(lhs).count() == CD(rhs).count();
@@ -673,7 +673,7 @@
template <class LhsDuration>
struct duration_eq<LhsDuration, LhsDuration>
{
- BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const LhsDuration& rhs)
+ BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const LhsDuration& rhs) const
{
return lhs.count() == rhs.count();
}
@@ -682,7 +682,7 @@
template <class LhsDuration, class RhsDuration>
struct duration_lt
{
- BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const RhsDuration& rhs)
+ BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const RhsDuration& rhs) const
{
typedef typename common_type<LhsDuration, RhsDuration>::type CD;
return CD(lhs).count() < CD(rhs).count();
@@ -692,7 +692,7 @@
template <class LhsDuration>
struct duration_lt<LhsDuration, LhsDuration>
{
- BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const LhsDuration& rhs)
+ BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const LhsDuration& rhs) const
{
return lhs.count() < rhs.count();
}
Modified: branches/release/libs/chrono/doc/chrono.qbk
==============================================================================
--- branches/release/libs/chrono/doc/chrono.qbk (original)
+++ branches/release/libs/chrono/doc/chrono.qbk 2013-06-03 12:48:42 EDT (Mon, 03 Jun 2013)
@@ -2864,7 +2864,7 @@
duration& __duration__op_plus_eq(const duration& d);
duration& __duration__op_minus_eq(const duration& d);
- duration& __duration__op_mult_eq=(const rep& rhs);
+ duration& __duration__op_mult_eq(const rep& rhs);
duration& __duration__op_div_eq(const rep& rhs);
duration& __duration__op_mod_eq(const rep& rhs);
duration& __duration__op_mod_eq2(const duration& rhs);