|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r69015 - trunk/boost/chrono
From: vicente.botet_at_[hidden]
Date: 2011-02-18 18:53:28
Author: viboes
Date: 2011-02-18 18:53:26 EST (Fri, 18 Feb 2011)
New Revision: 69015
URL: http://svn.boost.org/trac/boost/changeset/69015
Log:
Chrono
Text files modified:
trunk/boost/chrono/duration.hpp | 14 +++++++-------
trunk/boost/chrono/time_point.hpp | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
Modified: trunk/boost/chrono/duration.hpp
==============================================================================
--- trunk/boost/chrono/duration.hpp (original)
+++ trunk/boost/chrono/duration.hpp 2011-02-18 18:53:26 EST (Fri, 18 Feb 2011)
@@ -434,7 +434,7 @@
explicit duration(const Rep2& r
#if defined(BOOST_MSVC) && (BOOST_MSVC == 1500)
#else
- , typename boost::enable_if <
+ , typename boost::enable_if <
mpl::and_ <
boost::is_convertible<Rep2, rep>,
mpl::or_ <
@@ -446,8 +446,8 @@
>
>
>::type* = 0
-#endif
- )
+#endif
+ )
: rep_(r) { }
~duration() {} //= default;
duration(const duration& rhs) : rep_(rhs.rep_) {} // = default;
@@ -463,7 +463,7 @@
duration(const duration<Rep2, Period2>& d
#if defined(BOOST_MSVC) && (BOOST_MSVC == 1500)
#else
- , typename boost::enable_if <
+ , typename boost::enable_if <
mpl::or_ <
treat_as_floating_point<rep>,
mpl::and_ <
@@ -472,8 +472,8 @@
>
>
>::type* = 0
-#endif
- )
+#endif
+ )
: rep_(chrono::detail::duration_cast<duration<Rep2, Period2>, duration>()(d).count()) {}
// observer
@@ -561,7 +561,7 @@
template <class Rep1, class Period, class Rep2>
inline
#if defined(BOOST_MSVC) && (BOOST_MSVC == 1500)
- duration<typename common_type<Rep1, Rep2>::type, Period>
+ duration<typename common_type<Rep1, Rep2>::type, Period>
#else
typename boost::enable_if <
mpl::and_ <
Modified: trunk/boost/chrono/time_point.hpp
==============================================================================
--- trunk/boost/chrono/time_point.hpp (original)
+++ trunk/boost/chrono/time_point.hpp 2011-02-18 18:53:26 EST (Fri, 18 Feb 2011)
@@ -177,7 +177,7 @@
boost::is_convertible<Duration2, duration>
>::type* = 0
#endif
- )
+ )
: d_(t.time_since_epoch())
{
}
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