|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r74901 - in trunk: boost/chrono boost/chrono/detail/inlined/mac boost/chrono/detail/inlined/posix boost/chrono/detail/inlined/win boost/chrono/io boost/chrono/stopwatches boost/chrono/stopwatches/reporters libs/chrono/doc libs/chrono/test
From: vicente.botet_at_[hidden]
Date: 2011-10-10 15:27:43
Author: viboes
Date: 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
New Revision: 74901
URL: http://svn.boost.org/trac/boost/changeset/74901
Log:
Chrono: use config macros CONSTEXPR and NOEXCEPT
Text files modified:
trunk/boost/chrono/config.hpp | 32 +++++++++++-------
trunk/boost/chrono/detail/inlined/mac/chrono.hpp | 8 ++--
trunk/boost/chrono/detail/inlined/mac/process_cpu_clocks.hpp | 8 ++--
trunk/boost/chrono/detail/inlined/posix/chrono.hpp | 8 ++--
trunk/boost/chrono/detail/inlined/posix/process_cpu_clocks.hpp | 8 ++--
trunk/boost/chrono/detail/inlined/posix/thread_clock.hpp | 2
trunk/boost/chrono/detail/inlined/win/chrono.hpp | 10 +++---
trunk/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp | 8 ++--
trunk/boost/chrono/detail/inlined/win/thread_clock.hpp | 2
trunk/boost/chrono/duration.hpp | 66 ++++++++++++++++++++--------------------
trunk/boost/chrono/io/duration_io.hpp | 12 +++---
trunk/boost/chrono/io/time_point_io.hpp | 4 +-
trunk/boost/chrono/process_cpu_clocks.hpp | 28 ++++++++--------
trunk/boost/chrono/stopwatches/basic_stopwatch.hpp | 4 +-
trunk/boost/chrono/stopwatches/reporters/stopwatch_reporter.hpp | 12 +++---
trunk/boost/chrono/stopwatches/simple_stopwatch.hpp | 8 ++--
trunk/boost/chrono/stopwatches/suspendable_stopwatch.hpp | 2
trunk/boost/chrono/system_clocks.hpp | 12 +++---
trunk/boost/chrono/thread_clock.hpp | 4 +-
trunk/boost/chrono/time_point.hpp | 60 ++++++++++++++++++------------------
trunk/libs/chrono/doc/chrono.qbk | 4 +-
trunk/libs/chrono/test/cycle_count.hpp | 2
trunk/libs/chrono/test/rep.h | 8 ++--
23 files changed, 159 insertions(+), 153 deletions(-)
Modified: trunk/boost/chrono/config.hpp
==============================================================================
--- trunk/boost/chrono/config.hpp (original)
+++ trunk/boost/chrono/config.hpp 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
@@ -97,25 +97,31 @@
#define BOOST_CHRONO_HAS_UNICODE_SUPPORT 1
#endif
-// define constexpr related macros ------------------------------//
+//// define constexpr related macros ------------------------------//
+//
+//#if defined(BOOST_NO_CONSTEXPR)
+//#define BOOST_CHRONO_CONSTEXPR
+//#define BOOST_CHRONO_CONSTEXPR_OR_CONST const
+//#define BOOST_CHRONO_CONST_REF const&
+//#else
+//#define BOOST_CHRONO_CONSTEXPR constexpr
+//#define BOOST_CHRONO_CONSTEXPR_OR_CONST constexpr
+//#define BOOST_CHRONO_CONST_REF
+//#endif
-#if defined(BOOST_NO_CONSTEXPR)
-#define BOOST_CHRONO_CONSTEXPR
-#define BOOST_CHRONO_CONSTEXPR_OR_CONST const
-#define BOOST_CHRONO_CONST_REF const&
-#else
-#define BOOST_CHRONO_CONSTEXPR constexpr
-#define BOOST_CHRONO_CONSTEXPR_OR_CONST constexpr
-#define BOOST_CHRONO_CONST_REF
-#endif
+#if ! defined BOOST_NOEXCEPT
#if defined(BOOST_NO_NOEXCEPT)
-#define BOOST_CHRONO_NOEXCEPT
+#define BOOST_NOEXCEPT
#else
-#define BOOST_CHRONO_NOEXCEPT noexcept
+#define BOOST_NOEXCEPT noexcept
#endif
+#endif
+//
+//#undef BOOST_STATIC_CONSTEXPR
+//#define BOOST_STATIC_CONSTEXPR static BOOST_CHRONO_CONSTEXPR_OR_CONST
-#define BOOST_CHRONO_STATIC_CONSTEXPR static BOOST_CHRONO_CONSTEXPR_OR_CONST
+//#define BOOST_CHRONO_STATIC_CONSTEXPR static BOOST_CHRONO_CONSTEXPR_OR_CONST
#ifdef BOOST_CHRONO_HEADER_ONLY
Modified: trunk/boost/chrono/detail/inlined/mac/chrono.hpp
==============================================================================
--- trunk/boost/chrono/detail/inlined/mac/chrono.hpp (original)
+++ trunk/boost/chrono/detail/inlined/mac/chrono.hpp 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
@@ -26,7 +26,7 @@
// which has a field for seconds and a field for microseconds.
// Fill in the timeval and then convert that to the time_point
system_clock::time_point
-system_clock::now() BOOST_CHRONO_NOEXCEPT
+system_clock::now() BOOST_NOEXCEPT
{
timeval tv;
gettimeofday(&tv, 0);
@@ -50,14 +50,14 @@
// an integral count of seconds since New Years 1970 (same epoch as timeval).
// Just get the duration out of the time_point and truncate it to seconds.
time_t
-system_clock::to_time_t(const time_point& t) BOOST_CHRONO_NOEXCEPT
+system_clock::to_time_t(const time_point& t) BOOST_NOEXCEPT
{
return time_t(duration_cast<seconds>(t.time_since_epoch()).count());
}
// Just turn the time_t into a count of seconds and construct a time_point with it.
system_clock::time_point
-system_clock::from_time_t(time_t t) BOOST_CHRONO_NOEXCEPT
+system_clock::from_time_t(time_t t) BOOST_NOEXCEPT
{
return system_clock::time_point(seconds(t));
}
@@ -197,7 +197,7 @@
}
steady_clock::time_point
-steady_clock::now() BOOST_CHRONO_NOEXCEPT
+steady_clock::now() BOOST_NOEXCEPT
{
static kern_return_t err;
static chrono_detail::FP fp = chrono_detail::init_steady_clock(err);
Modified: trunk/boost/chrono/detail/inlined/mac/process_cpu_clocks.hpp
==============================================================================
--- trunk/boost/chrono/detail/inlined/mac/process_cpu_clocks.hpp (original)
+++ trunk/boost/chrono/detail/inlined/mac/process_cpu_clocks.hpp 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
@@ -46,7 +46,7 @@
}
- process_real_cpu_clock::time_point process_real_cpu_clock::now() BOOST_CHRONO_NOEXCEPT
+ process_real_cpu_clock::time_point process_real_cpu_clock::now() BOOST_NOEXCEPT
{
#if 0
tms tm;
@@ -179,7 +179,7 @@
}
#endif
- process_user_cpu_clock::time_point process_user_cpu_clock::now() BOOST_CHRONO_NOEXCEPT
+ process_user_cpu_clock::time_point process_user_cpu_clock::now() BOOST_NOEXCEPT
{
tms tm;
clock_t c = ::times(&tm);
@@ -200,7 +200,7 @@
}
return time_point();
}
- process_system_cpu_clock::time_point process_system_cpu_clock::now() BOOST_CHRONO_NOEXCEPT
+ process_system_cpu_clock::time_point process_system_cpu_clock::now() BOOST_NOEXCEPT
{
tms tm;
clock_t c = ::times(&tm);
@@ -262,7 +262,7 @@
}
#endif
- process_cpu_clock::time_point process_cpu_clock::now() BOOST_CHRONO_NOEXCEPT
+ process_cpu_clock::time_point process_cpu_clock::now() BOOST_NOEXCEPT
{
tms tm;
clock_t c = ::times(&tm);
Modified: trunk/boost/chrono/detail/inlined/posix/chrono.hpp
==============================================================================
--- trunk/boost/chrono/detail/inlined/posix/chrono.hpp (original)
+++ trunk/boost/chrono/detail/inlined/posix/chrono.hpp 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
@@ -17,7 +17,7 @@
namespace chrono
{
- system_clock::time_point system_clock::now() BOOST_CHRONO_NOEXCEPT
+ system_clock::time_point system_clock::now() BOOST_NOEXCEPT
{
timespec ts;
if ( ::clock_gettime( CLOCK_REALTIME, &ts ) )
@@ -59,19 +59,19 @@
}
#endif
- std::time_t system_clock::to_time_t(const system_clock::time_point& t) BOOST_CHRONO_NOEXCEPT
+ std::time_t system_clock::to_time_t(const system_clock::time_point& t) BOOST_NOEXCEPT
{
return static_cast<std::time_t>( t.time_since_epoch().count() / 1000000000 );
}
- system_clock::time_point system_clock::from_time_t(std::time_t t) BOOST_CHRONO_NOEXCEPT
+ system_clock::time_point system_clock::from_time_t(std::time_t t) BOOST_NOEXCEPT
{
return time_point(duration(static_cast<system_clock::rep>(t) * 1000000000));
}
#ifdef BOOST_CHRONO_HAS_CLOCK_STEADY
- steady_clock::time_point steady_clock::now() BOOST_CHRONO_NOEXCEPT
+ steady_clock::time_point steady_clock::now() BOOST_NOEXCEPT
{
timespec ts;
if ( ::clock_gettime( CLOCK_MONOTONIC, &ts ) )
Modified: trunk/boost/chrono/detail/inlined/posix/process_cpu_clocks.hpp
==============================================================================
--- trunk/boost/chrono/detail/inlined/posix/process_cpu_clocks.hpp (original)
+++ trunk/boost/chrono/detail/inlined/posix/process_cpu_clocks.hpp 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
@@ -41,7 +41,7 @@
}
}
-process_real_cpu_clock::time_point process_real_cpu_clock::now() BOOST_CHRONO_NOEXCEPT
+process_real_cpu_clock::time_point process_real_cpu_clock::now() BOOST_NOEXCEPT
{
tms tm;
clock_t c = ::times( &tm );
@@ -118,7 +118,7 @@
}
#endif
-process_user_cpu_clock::time_point process_user_cpu_clock::now() BOOST_CHRONO_NOEXCEPT
+process_user_cpu_clock::time_point process_user_cpu_clock::now() BOOST_NOEXCEPT
{
tms tm;
clock_t c = ::times( &tm );
@@ -194,7 +194,7 @@
}
#endif
-process_system_cpu_clock::time_point process_system_cpu_clock::now() BOOST_CHRONO_NOEXCEPT
+process_system_cpu_clock::time_point process_system_cpu_clock::now() BOOST_NOEXCEPT
{
tms tm;
clock_t c = ::times( &tm );
@@ -270,7 +270,7 @@
}
#endif
-process_cpu_clock::time_point process_cpu_clock::now() BOOST_CHRONO_NOEXCEPT
+process_cpu_clock::time_point process_cpu_clock::now() BOOST_NOEXCEPT
{
tms tm;
clock_t c = ::times( &tm );
Modified: trunk/boost/chrono/detail/inlined/posix/thread_clock.hpp
==============================================================================
--- trunk/boost/chrono/detail/inlined/posix/thread_clock.hpp (original)
+++ trunk/boost/chrono/detail/inlined/posix/thread_clock.hpp 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
@@ -19,7 +19,7 @@
namespace boost { namespace chrono {
- thread_clock::time_point thread_clock::now( ) BOOST_CHRONO_NOEXCEPT
+ thread_clock::time_point thread_clock::now( ) BOOST_NOEXCEPT
{
struct timespec ts;
#if defined CLOCK_THREAD_CPUTIME_ID
Modified: trunk/boost/chrono/detail/inlined/win/chrono.hpp
==============================================================================
--- trunk/boost/chrono/detail/inlined/win/chrono.hpp (original)
+++ trunk/boost/chrono/detail/inlined/win/chrono.hpp 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
@@ -23,7 +23,7 @@
namespace chrono_detail
{
- BOOST_CHRONO_INLINE double get_nanosecs_per_tic() BOOST_CHRONO_NOEXCEPT
+ BOOST_CHRONO_INLINE double get_nanosecs_per_tic() BOOST_NOEXCEPT
{
boost::detail::win32::LARGE_INTEGER_ freq;
if ( !boost::detail::win32::QueryPerformanceFrequency( &freq ) )
@@ -33,7 +33,7 @@
}
- steady_clock::time_point steady_clock::now() BOOST_CHRONO_NOEXCEPT
+ steady_clock::time_point steady_clock::now() BOOST_NOEXCEPT
{
static double nanosecs_per_tic = chrono_detail::get_nanosecs_per_tic();
@@ -86,7 +86,7 @@
#endif
BOOST_CHRONO_INLINE
- system_clock::time_point system_clock::now() BOOST_CHRONO_NOEXCEPT
+ system_clock::time_point system_clock::now() BOOST_NOEXCEPT
{
boost::detail::win32::FILETIME_ ft;
#if defined(UNDER_CE)
@@ -124,7 +124,7 @@
#endif
BOOST_CHRONO_INLINE
- std::time_t system_clock::to_time_t(const system_clock::time_point& t) BOOST_CHRONO_NOEXCEPT
+ std::time_t system_clock::to_time_t(const system_clock::time_point& t) BOOST_NOEXCEPT
{
__int64 temp = t.time_since_epoch().count();
@@ -139,7 +139,7 @@
}
BOOST_CHRONO_INLINE
- system_clock::time_point system_clock::from_time_t(std::time_t t) BOOST_CHRONO_NOEXCEPT
+ system_clock::time_point system_clock::from_time_t(std::time_t t) BOOST_NOEXCEPT
{
__int64 temp = t;
temp *= 10000000;
Modified: trunk/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp
==============================================================================
--- trunk/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp (original)
+++ trunk/boost/chrono/detail/inlined/win/process_cpu_clocks.hpp 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
@@ -27,7 +27,7 @@
namespace chrono
{
-process_real_cpu_clock::time_point process_real_cpu_clock::now() BOOST_CHRONO_NOEXCEPT
+process_real_cpu_clock::time_point process_real_cpu_clock::now() BOOST_NOEXCEPT
{
clock_t c = ::clock();
if ( c == clock_t(-1) ) // error
@@ -62,7 +62,7 @@
}
#endif
-process_user_cpu_clock::time_point process_user_cpu_clock::now() BOOST_CHRONO_NOEXCEPT
+process_user_cpu_clock::time_point process_user_cpu_clock::now() BOOST_NOEXCEPT
{
// note that Windows uses 100 nanosecond ticks for FILETIME
@@ -127,7 +127,7 @@
}
#endif
-process_system_cpu_clock::time_point process_system_cpu_clock::now() BOOST_CHRONO_NOEXCEPT
+process_system_cpu_clock::time_point process_system_cpu_clock::now() BOOST_NOEXCEPT
{
// note that Windows uses 100 nanosecond ticks for FILETIME
@@ -192,7 +192,7 @@
}
#endif
-process_cpu_clock::time_point process_cpu_clock::now() BOOST_CHRONO_NOEXCEPT
+process_cpu_clock::time_point process_cpu_clock::now() BOOST_NOEXCEPT
{
// note that Windows uses 100 nanosecond ticks for FILETIME
Modified: trunk/boost/chrono/detail/inlined/win/thread_clock.hpp
==============================================================================
--- trunk/boost/chrono/detail/inlined/win/thread_clock.hpp (original)
+++ trunk/boost/chrono/detail/inlined/win/thread_clock.hpp 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
@@ -68,7 +68,7 @@
}
#endif
-thread_clock::time_point thread_clock::now() BOOST_CHRONO_NOEXCEPT
+thread_clock::time_point thread_clock::now() BOOST_NOEXCEPT
{
// note that Windows uses 100 nanosecond ticks for FILETIME
Modified: trunk/boost/chrono/duration.hpp
==============================================================================
--- trunk/boost/chrono/duration.hpp (original)
+++ trunk/boost/chrono/duration.hpp 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
@@ -229,7 +229,7 @@
template <class FromDuration, class ToDuration, class Period>
struct duration_cast_aux<FromDuration, ToDuration, Period, true, true>
{
- BOOST_CHRONO_CONSTEXPR ToDuration operator()(const FromDuration& fd) const
+ BOOST_CONSTEXPR ToDuration operator()(const FromDuration& fd) const
{
return ToDuration(static_cast<typename ToDuration::rep>(fd.count()));
}
@@ -244,7 +244,7 @@
template <class FromDuration, class ToDuration, class Period>
struct duration_cast_aux<FromDuration, ToDuration, Period, true, false>
{
- BOOST_CHRONO_CONSTEXPR ToDuration operator()(const FromDuration& fd) const
+ BOOST_CONSTEXPR ToDuration operator()(const FromDuration& fd) const
{
typedef typename common_type<
typename ToDuration::rep,
@@ -263,7 +263,7 @@
template <class FromDuration, class ToDuration, class Period>
struct duration_cast_aux<FromDuration, ToDuration, Period, false, true>
{
- BOOST_CHRONO_CONSTEXPR ToDuration operator()(const FromDuration& fd) const
+ BOOST_CONSTEXPR ToDuration operator()(const FromDuration& fd) const
{
typedef typename common_type<
typename ToDuration::rep,
@@ -283,7 +283,7 @@
template <class FromDuration, class ToDuration, class Period>
struct duration_cast_aux<FromDuration, ToDuration, Period, false, false>
{
- BOOST_CHRONO_CONSTEXPR ToDuration operator()(const FromDuration& fd) const
+ BOOST_CONSTEXPR ToDuration operator()(const FromDuration& fd) const
{
typedef typename common_type<
typename ToDuration::rep,
@@ -306,7 +306,7 @@
Period::num == 1,
Period::den == 1
> Aux;
- BOOST_CHRONO_CONSTEXPR ToDuration operator()(const FromDuration& fd) const
+ BOOST_CONSTEXPR ToDuration operator()(const FromDuration& fd) const
{
return Aux()(fd);
}
@@ -376,13 +376,13 @@
template <class Rep>
struct duration_values
{
- static BOOST_CHRONO_CONSTEXPR Rep zero() {return Rep(0);}
- static BOOST_CHRONO_CONSTEXPR Rep max BOOST_PREVENT_MACRO_SUBSTITUTION ()
+ static BOOST_CONSTEXPR Rep zero() {return Rep(0);}
+ static BOOST_CONSTEXPR Rep max BOOST_PREVENT_MACRO_SUBSTITUTION ()
{
return (std::numeric_limits<Rep>::max)();
}
- static BOOST_CHRONO_CONSTEXPR Rep min BOOST_PREVENT_MACRO_SUBSTITUTION ()
+ static BOOST_CONSTEXPR Rep min BOOST_PREVENT_MACRO_SUBSTITUTION ()
{
return detail::numeric_limits<Rep>::lowest();
}
@@ -429,10 +429,10 @@
rep rep_;
public:
- BOOST_CHRONO_CONSTEXPR
+ BOOST_CONSTEXPR
duration() : rep_(duration_values<rep>::zero()) { }
template <class Rep2>
- BOOST_CHRONO_CONSTEXPR
+ BOOST_CONSTEXPR
explicit duration(const Rep2& r
, typename boost::enable_if <
mpl::and_ <
@@ -448,7 +448,7 @@
>::type* = 0
) : rep_(r) { }
~duration() {} //= default;
- BOOST_CHRONO_CONSTEXPR
+ BOOST_CONSTEXPR
duration(const duration& rhs) : rep_(rhs.rep_) {} // = default;
duration& operator=(const duration& rhs) // = default;
{
@@ -458,7 +458,7 @@
// conversions
template <class Rep2, class Period2>
- BOOST_CHRONO_CONSTEXPR
+ BOOST_CONSTEXPR
duration(const duration<Rep2, Period2>& d
, typename boost::enable_if <
mpl::or_ <
@@ -474,14 +474,14 @@
// observer
- BOOST_CHRONO_CONSTEXPR
+ BOOST_CONSTEXPR
rep count() const {return rep_;}
// arithmetic
- BOOST_CHRONO_CONSTEXPR
+ BOOST_CONSTEXPR
duration operator+() const {return *this;}
- BOOST_CHRONO_CONSTEXPR
+ BOOST_CONSTEXPR
duration operator-() const {return duration(-rep_);}
duration& operator++() {++rep_; return *this;}
duration operator++(int) {return duration(rep_++);}
@@ -506,15 +506,15 @@
}
// 20.9.3.4 duration special values [time.duration.special]
- static BOOST_CHRONO_CONSTEXPR duration zero()
+ static BOOST_CONSTEXPR duration zero()
{
return duration(duration_values<rep>::zero());
}
- static BOOST_CHRONO_CONSTEXPR duration min BOOST_PREVENT_MACRO_SUBSTITUTION ()
+ static BOOST_CONSTEXPR duration min BOOST_PREVENT_MACRO_SUBSTITUTION ()
{
return duration((duration_values<rep>::min)());
}
- static BOOST_CHRONO_CONSTEXPR duration max BOOST_PREVENT_MACRO_SUBSTITUTION ()
+ static BOOST_CONSTEXPR duration max BOOST_PREVENT_MACRO_SUBSTITUTION ()
{
return duration((duration_values<rep>::max)());
}
@@ -527,7 +527,7 @@
// Duration +
template <class Rep1, class Period1, class Rep2, class Period2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
typename common_type<duration<Rep1, Period1>, duration<Rep2, Period2> >::type
operator+(const duration<Rep1, Period1>& lhs,
const duration<Rep2, Period2>& rhs)
@@ -540,7 +540,7 @@
// Duration -
template <class Rep1, class Period1, class Rep2, class Period2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
typename common_type<duration<Rep1, Period1>, duration<Rep2, Period2> >::type
operator-(const duration<Rep1, Period1>& lhs,
const duration<Rep2, Period2>& rhs)
@@ -553,7 +553,7 @@
// Duration *
template <class Rep1, class Period, class Rep2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
typename boost::enable_if <
mpl::and_ <
boost::is_convertible<Rep1, typename common_type<Rep1, Rep2>::type>,
@@ -569,7 +569,7 @@
}
template <class Rep1, class Period, class Rep2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
typename boost::enable_if <
mpl::and_ <
boost::is_convertible<Rep1, typename common_type<Rep1, Rep2>::type>,
@@ -585,7 +585,7 @@
// Duration /
template <class Rep1, class Period, class Rep2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
typename boost::disable_if <boost::chrono::detail::is_duration<Rep2>,
typename boost::chrono::detail::duration_divide_result<
duration<Rep1, Period>, Rep2>::type
@@ -599,7 +599,7 @@
}
template <class Rep1, class Period1, class Rep2, class Period2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
typename common_type<Rep1, Rep2>::type
operator/(const duration<Rep1, Period1>& lhs, const duration<Rep2, Period2>& rhs)
{
@@ -610,7 +610,7 @@
#ifdef BOOST_CHRONO_EXTENSIONS
template <class Rep1, class Rep2, class Period>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
typename boost::disable_if <boost::chrono::detail::is_duration<Rep1>,
typename boost::chrono::detail::duration_divide_result2<
Rep1, duration<Rep2, Period> >::type
@@ -626,7 +626,7 @@
// Duration %
template <class Rep1, class Period, class Rep2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
typename boost::disable_if <boost::chrono::detail::is_duration<Rep2>,
typename boost::chrono::detail::duration_modulo_result<
duration<Rep1, Period>, Rep2>::type
@@ -640,7 +640,7 @@
}
template <class Rep1, class Period1, class Rep2, class Period2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
typename common_type<duration<Rep1, Period1>, duration<Rep2, Period2> >::type
operator%(const duration<Rep1, Period1>& lhs,
const duration<Rep2, Period2>& rhs) {
@@ -700,7 +700,7 @@
// Duration ==
template <class Rep1, class Period1, class Rep2, class Period2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
bool
operator==(const duration<Rep1, Period1>& lhs,
const duration<Rep2, Period2>& rhs)
@@ -712,7 +712,7 @@
// Duration !=
template <class Rep1, class Period1, class Rep2, class Period2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
bool
operator!=(const duration<Rep1, Period1>& lhs,
const duration<Rep2, Period2>& rhs)
@@ -723,7 +723,7 @@
// Duration <
template <class Rep1, class Period1, class Rep2, class Period2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
bool
operator< (const duration<Rep1, Period1>& lhs,
const duration<Rep2, Period2>& rhs)
@@ -735,7 +735,7 @@
// Duration >
template <class Rep1, class Period1, class Rep2, class Period2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
bool
operator> (const duration<Rep1, Period1>& lhs,
const duration<Rep2, Period2>& rhs)
@@ -746,7 +746,7 @@
// Duration <=
template <class Rep1, class Period1, class Rep2, class Period2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
bool
operator<=(const duration<Rep1, Period1>& lhs,
const duration<Rep2, Period2>& rhs)
@@ -771,7 +771,7 @@
// Compile-time select the most efficient algorithm for the conversion...
template <class ToDuration, class Rep, class Period>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
typename boost::enable_if <
boost::chrono::detail::is_duration<ToDuration>, ToDuration>::type
duration_cast(const duration<Rep, Period>& fd)
Modified: trunk/boost/chrono/io/duration_io.hpp
==============================================================================
--- trunk/boost/chrono/io/duration_io.hpp (original)
+++ trunk/boost/chrono/io/duration_io.hpp 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
@@ -136,15 +136,15 @@
- bool is_symbol() const BOOST_CHRONO_NOEXCEPT
+ bool is_symbol() const BOOST_NOEXCEPT
{
return (style_==duration_style::symbol);
}
- bool is_prefix() const BOOST_CHRONO_NOEXCEPT
+ bool is_prefix() const BOOST_NOEXCEPT
{
return (style_==duration_style::prefix);
}
- duration_style::type get_duration_style() const BOOST_CHRONO_NOEXCEPT
+ duration_style::type get_duration_style() const BOOST_NOEXCEPT
{
return style_;
}
@@ -275,7 +275,7 @@
/**
* explicit manipulator constructor from a @c duration_style
*/
- explicit duration_fmt(duration_style::type style) BOOST_CHRONO_NOEXCEPT
+ explicit duration_fmt(duration_style::type style) BOOST_NOEXCEPT
: style_(style)
{}
@@ -284,14 +284,14 @@
* explicit conversion to the @c duration_style scoped enum.
*/
explicit
- operator duration_style::type() const BOOST_CHRONO_NOEXCEPT
+ operator duration_style::type() const BOOST_NOEXCEPT
{ return style_;}
#endif
/**
* gets the @c duration_style scoped enum.
*/
- duration_style::type get_duration_style() const BOOST_CHRONO_NOEXCEPT
+ duration_style::type get_duration_style() const BOOST_NOEXCEPT
{ return style_;}
};
Modified: trunk/boost/chrono/io/time_point_io.hpp
==============================================================================
--- trunk/boost/chrono/io/time_point_io.hpp (original)
+++ trunk/boost/chrono/io/time_point_io.hpp 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
@@ -60,11 +60,11 @@
{
}
- const string_type& fmt() const BOOST_CHRONO_NOEXCEPT
+ const string_type& fmt() const BOOST_NOEXCEPT
{
return fmt_;
}
- chrono::timezone_type get_timezone() const BOOST_CHRONO_NOEXCEPT
+ chrono::timezone_type get_timezone() const BOOST_NOEXCEPT
{
return tz_;
}
Modified: trunk/boost/chrono/process_cpu_clocks.hpp
==============================================================================
--- trunk/boost/chrono/process_cpu_clocks.hpp (original)
+++ trunk/boost/chrono/process_cpu_clocks.hpp 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
@@ -39,9 +39,9 @@
typedef duration::rep rep;
typedef duration::period period;
typedef chrono::time_point<process_real_cpu_clock> time_point;
- BOOST_CHRONO_STATIC_CONSTEXPR bool is_steady = true;
+ BOOST_STATIC_CONSTEXPR bool is_steady = true;
- static BOOST_CHRONO_INLINE time_point now() BOOST_CHRONO_NOEXCEPT;
+ static BOOST_CHRONO_INLINE time_point now() BOOST_NOEXCEPT;
#if !defined BOOST_CHRONO_DONT_PROVIDE_HYBRID_ERROR_HANDLING
static BOOST_CHRONO_INLINE time_point now(system::error_code & ec );
#endif
@@ -53,9 +53,9 @@
typedef duration::rep rep;
typedef duration::period period;
typedef chrono::time_point<process_user_cpu_clock> time_point;
- BOOST_CHRONO_STATIC_CONSTEXPR bool is_steady = true;
+ BOOST_STATIC_CONSTEXPR bool is_steady = true;
- static BOOST_CHRONO_INLINE time_point now() BOOST_CHRONO_NOEXCEPT;
+ static BOOST_CHRONO_INLINE time_point now() BOOST_NOEXCEPT;
#if !defined BOOST_CHRONO_DONT_PROVIDE_HYBRID_ERROR_HANDLING
static BOOST_CHRONO_INLINE time_point now(system::error_code & ec );
#endif
@@ -67,9 +67,9 @@
typedef duration::rep rep;
typedef duration::period period;
typedef chrono::time_point<process_system_cpu_clock> time_point;
- BOOST_CHRONO_STATIC_CONSTEXPR bool is_steady = true;
+ BOOST_STATIC_CONSTEXPR bool is_steady = true;
- static BOOST_CHRONO_INLINE time_point now() BOOST_CHRONO_NOEXCEPT;
+ static BOOST_CHRONO_INLINE time_point now() BOOST_NOEXCEPT;
#if !defined BOOST_CHRONO_DONT_PROVIDE_HYBRID_ERROR_HANDLING
static BOOST_CHRONO_INLINE time_point now(system::error_code & ec );
#endif
@@ -234,7 +234,7 @@
namespace chrono
{
template <class Rep1, class Period1, class Rep2, class Period2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
bool
operator==(const duration<process_times<Rep1>, Period1>& lhs,
const duration<process_times<Rep2>, Period2>& rhs)
@@ -244,7 +244,7 @@
}
template <class Rep1, class Period1, class Rep2, class Period2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
bool
operator==(const duration<process_times<Rep1>, Period1>& lhs,
const duration<Rep2, Period2>& rhs)
@@ -254,7 +254,7 @@
}
template <class Rep1, class Period1, class Rep2, class Period2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
bool
operator==(const duration<Rep1, Period1>& lhs,
const duration<process_times<Rep2>, Period2>& rhs)
@@ -266,7 +266,7 @@
// Duration <
template <class Rep1, class Period1, class Rep2, class Period2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
bool
operator< (const duration<process_times<Rep1>, Period1>& lhs,
const duration<Rep2, Period2>& rhs)
@@ -276,7 +276,7 @@
}
template <class Rep1, class Period1, class Rep2, class Period2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
bool
operator< (const duration<Rep1, Period1>& lhs,
const duration<process_times<Rep2>, Period2>& rhs)
@@ -285,7 +285,7 @@
}
template <class Rep1, class Period1, class Rep2, class Period2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
bool
operator< (const duration<process_times<Rep1>, Period1>& lhs,
const duration<process_times<Rep2>, Period2>& rhs)
@@ -305,9 +305,9 @@
typedef duration::rep rep;
typedef duration::period period;
typedef chrono::time_point<process_cpu_clock> time_point;
- BOOST_CHRONO_STATIC_CONSTEXPR bool is_steady = true;
+ BOOST_STATIC_CONSTEXPR bool is_steady = true;
- static BOOST_CHRONO_INLINE time_point now() BOOST_CHRONO_NOEXCEPT;
+ static BOOST_CHRONO_INLINE time_point now() BOOST_NOEXCEPT;
#if !defined BOOST_CHRONO_DONT_PROVIDE_HYBRID_ERROR_HANDLING
static BOOST_CHRONO_INLINE time_point now(system::error_code & ec );
#endif
Modified: trunk/boost/chrono/stopwatches/basic_stopwatch.hpp
==============================================================================
--- trunk/boost/chrono/stopwatches/basic_stopwatch.hpp (original)
+++ trunk/boost/chrono/stopwatches/basic_stopwatch.hpp 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
@@ -49,7 +49,7 @@
typedef typename Clock::time_point time_point;
typedef typename Clock::rep rep;
typedef typename Clock::period period;
- BOOST_CHRONO_STATIC_CONSTEXPR bool is_steady = Clock::is_steady;
+ BOOST_STATIC_CONSTEXPR bool is_steady = Clock::is_steady;
/**
* Default constructor.
@@ -412,7 +412,7 @@
* Returns: the LapCollector instance.
*
*/
- laps_collector const& get_laps_collector() BOOST_CHRONO_NOEXCEPT
+ laps_collector const& get_laps_collector() BOOST_NOEXCEPT
{
return laps_collector_;
}
Modified: trunk/boost/chrono/stopwatches/reporters/stopwatch_reporter.hpp
==============================================================================
--- trunk/boost/chrono/stopwatches/reporters/stopwatch_reporter.hpp (original)
+++ trunk/boost/chrono/stopwatches/reporters/stopwatch_reporter.hpp 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
@@ -40,7 +40,7 @@
typedef Stopwatch stopwatch;
typedef Formatter formatter_type;
- basic_stopwatch_reporter() BOOST_CHRONO_NOEXCEPT :
+ basic_stopwatch_reporter() BOOST_NOEXCEPT :
formatter_(), reported_(false)
{
}
@@ -54,7 +54,7 @@
explicit basic_stopwatch_reporter(
const dont_start_t& tag
- ) BOOST_CHRONO_NOEXCEPT :
+ ) BOOST_NOEXCEPT :
base_type(tag),
formatter_(), reported_(false)
{
@@ -73,7 +73,7 @@
{
}
- ~basic_stopwatch_reporter() BOOST_CHRONO_NOEXCEPT
+ ~basic_stopwatch_reporter() BOOST_NOEXCEPT
{
if (!reported())
{
@@ -81,7 +81,7 @@
}
}
- inline void report() BOOST_CHRONO_NOEXCEPT
+ inline void report() BOOST_NOEXCEPT
{
formatter_(*this);
reported_ = true;
@@ -145,7 +145,7 @@
#endif
explicit stopwatch_reporter(
const dont_start_t& tag
- ) BOOST_CHRONO_NOEXCEPT :
+ ) BOOST_NOEXCEPT :
base_type(tag)
{
}
@@ -212,7 +212,7 @@
#endif
explicit wstopwatch_reporter(
const dont_start_t& tag
- ) BOOST_CHRONO_NOEXCEPT :
+ ) BOOST_NOEXCEPT :
base_type(tag)
{
}
Modified: trunk/boost/chrono/stopwatches/simple_stopwatch.hpp
==============================================================================
--- trunk/boost/chrono/stopwatches/simple_stopwatch.hpp (original)
+++ trunk/boost/chrono/stopwatches/simple_stopwatch.hpp 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
@@ -31,10 +31,10 @@
typedef typename Clock::time_point time_point;
typedef typename Clock::rep rep;
typedef typename Clock::period period;
- BOOST_CHRONO_STATIC_CONSTEXPR bool is_steady = Clock::is_steady;
+ BOOST_STATIC_CONSTEXPR bool is_steady = Clock::is_steady;
- simple_stopwatch() BOOST_CHRONO_NOEXCEPT :
+ simple_stopwatch() BOOST_NOEXCEPT :
start_(clock::now())
{
}
@@ -54,11 +54,11 @@
}
#endif
- ~simple_stopwatch() BOOST_CHRONO_NOEXCEPT
+ ~simple_stopwatch() BOOST_NOEXCEPT
{
}
- duration elapsed() BOOST_CHRONO_NOEXCEPT
+ duration elapsed() BOOST_NOEXCEPT
{
return clock::now() - start_;
}
Modified: trunk/boost/chrono/stopwatches/suspendable_stopwatch.hpp
==============================================================================
--- trunk/boost/chrono/stopwatches/suspendable_stopwatch.hpp (original)
+++ trunk/boost/chrono/stopwatches/suspendable_stopwatch.hpp 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
@@ -36,7 +36,7 @@
typedef typename Clock::time_point time_point;
typedef typename Clock::rep rep;
typedef typename Clock::period period;
- BOOST_CHRONO_STATIC_CONSTEXPR bool is_steady = Clock::is_steady;
+ BOOST_STATIC_CONSTEXPR bool is_steady = Clock::is_steady;
suspendable_stopwatch() :
start_(duration::zero()),
Modified: trunk/boost/chrono/system_clocks.hpp
==============================================================================
--- trunk/boost/chrono/system_clocks.hpp (original)
+++ trunk/boost/chrono/system_clocks.hpp 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
@@ -128,15 +128,15 @@
typedef duration::rep rep;
typedef duration::period period;
typedef chrono::time_point<system_clock> time_point;
- BOOST_CHRONO_STATIC_CONSTEXPR bool is_steady = false;
+ BOOST_STATIC_CONSTEXPR bool is_steady = false;
- static BOOST_CHRONO_INLINE time_point now() BOOST_CHRONO_NOEXCEPT;
+ static BOOST_CHRONO_INLINE time_point now() BOOST_NOEXCEPT;
#if !defined BOOST_CHRONO_DONT_PROVIDE_HYBRID_ERROR_HANDLING
static BOOST_CHRONO_INLINE time_point now(system::error_code & ec);
#endif
- static BOOST_CHRONO_INLINE std::time_t to_time_t(const time_point& t) BOOST_CHRONO_NOEXCEPT;
- static BOOST_CHRONO_INLINE time_point from_time_t(std::time_t t) BOOST_CHRONO_NOEXCEPT;
+ static BOOST_CHRONO_INLINE std::time_t to_time_t(const time_point& t) BOOST_NOEXCEPT;
+ static BOOST_CHRONO_INLINE time_point from_time_t(std::time_t t) BOOST_NOEXCEPT;
};
//----------------------------------------------------------------------------//
@@ -154,9 +154,9 @@
typedef duration::rep rep;
typedef duration::period period;
typedef chrono::time_point<steady_clock> time_point;
- BOOST_CHRONO_STATIC_CONSTEXPR bool is_steady = true;
+ BOOST_STATIC_CONSTEXPR bool is_steady = true;
- static BOOST_CHRONO_INLINE time_point now() BOOST_CHRONO_NOEXCEPT;
+ static BOOST_CHRONO_INLINE time_point now() BOOST_NOEXCEPT;
#if !defined BOOST_CHRONO_DONT_PROVIDE_HYBRID_ERROR_HANDLING
static BOOST_CHRONO_INLINE time_point now(system::error_code & ec);
#endif
Modified: trunk/boost/chrono/thread_clock.hpp
==============================================================================
--- trunk/boost/chrono/thread_clock.hpp (original)
+++ trunk/boost/chrono/thread_clock.hpp 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
@@ -35,9 +35,9 @@
typedef duration::rep rep;
typedef duration::period period;
typedef chrono::time_point<thread_clock> time_point;
- BOOST_CHRONO_STATIC_CONSTEXPR bool is_steady = BOOST_CHRONO_THREAD_CLOCK_IS_STEADY;
+ BOOST_STATIC_CONSTEXPR bool is_steady = BOOST_CHRONO_THREAD_CLOCK_IS_STEADY;
- static BOOST_CHRONO_INLINE time_point now( ) BOOST_CHRONO_NOEXCEPT;
+ static BOOST_CHRONO_INLINE time_point now( ) BOOST_NOEXCEPT;
#if !defined BOOST_CHRONO_DONT_PROVIDE_HYBRID_ERROR_HANDLING
static BOOST_CHRONO_INLINE time_point now( system::error_code & ec );
#endif
Modified: trunk/boost/chrono/time_point.hpp
==============================================================================
--- trunk/boost/chrono/time_point.hpp (original)
+++ trunk/boost/chrono/time_point.hpp 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
@@ -78,28 +78,28 @@
// time_point arithmetic
template <class Clock, class Duration1, class Rep2, class Period2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
time_point<Clock,
typename common_type<Duration1, duration<Rep2, Period2> >::type>
operator+(
const time_point<Clock, Duration1>& lhs,
const duration<Rep2, Period2>& rhs);
template <class Rep1, class Period1, class Clock, class Duration2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
time_point<Clock,
typename common_type<duration<Rep1, Period1>, Duration2>::type>
operator+(
const duration<Rep1, Period1>& lhs,
const time_point<Clock, Duration2>& rhs);
template <class Clock, class Duration1, class Rep2, class Period2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
time_point<Clock,
typename common_type<Duration1, duration<Rep2, Period2> >::type>
operator-(
const time_point<Clock, Duration1>& lhs,
const duration<Rep2, Period2>& rhs);
template <class Clock, class Duration1, class Duration2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
typename common_type<Duration1, Duration2>::type
operator-(
const time_point<Clock, Duration1>& lhs,
@@ -108,39 +108,39 @@
// time_point comparisons
template <class Clock, class Duration1, class Duration2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
bool operator==(
const time_point<Clock, Duration1>& lhs,
const time_point<Clock, Duration2>& rhs);
template <class Clock, class Duration1, class Duration2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
bool operator!=(
const time_point<Clock, Duration1>& lhs,
const time_point<Clock, Duration2>& rhs);
template <class Clock, class Duration1, class Duration2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
bool operator< (
const time_point<Clock, Duration1>& lhs,
const time_point<Clock, Duration2>& rhs);
template <class Clock, class Duration1, class Duration2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
bool operator<=(
const time_point<Clock, Duration1>& lhs,
const time_point<Clock, Duration2>& rhs);
template <class Clock, class Duration1, class Duration2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
bool operator> (
const time_point<Clock, Duration1>& lhs,
const time_point<Clock, Duration2>& rhs);
template <class Clock, class Duration1, class Duration2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
bool operator>=(
const time_point<Clock, Duration1>& lhs,
const time_point<Clock, Duration2>& rhs);
// time_point_cast
template <class ToDuration, class Clock, class Duration>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
time_point<Clock, ToDuration> time_point_cast(const time_point<Clock, Duration>& t);
//----------------------------------------------------------------------------//
@@ -165,16 +165,16 @@
duration d_;
public:
- BOOST_CHRONO_CONSTEXPR
+ BOOST_CONSTEXPR
time_point() : d_(duration::zero())
{}
- BOOST_CHRONO_CONSTEXPR explicit time_point(const duration& d)
+ BOOST_CONSTEXPR explicit time_point(const duration& d)
: d_(d)
{}
// conversions
template <class Duration2>
- BOOST_CHRONO_CONSTEXPR
+ BOOST_CONSTEXPR
time_point(const time_point<clock, Duration2>& t
, typename boost::enable_if
<
@@ -186,7 +186,7 @@
}
// observer
- BOOST_CHRONO_CONSTEXPR
+ BOOST_CONSTEXPR
duration time_since_epoch() const
{
return d_;
@@ -195,9 +195,9 @@
// arithmetic
#ifdef BOOST_CHRONO_EXTENSIONS
- BOOST_CHRONO_CONSTEXPR
+ BOOST_CONSTEXPR
time_point operator+() const {return *this;}
- BOOST_CHRONO_CONSTEXPR
+ BOOST_CONSTEXPR
time_point operator-() const {return time_point(-d_);}
time_point& operator++() {++d_; return *this;}
time_point operator++(int) {return time_point(d_++);}
@@ -214,12 +214,12 @@
// special values
- static BOOST_CHRONO_CONSTEXPR time_point
+ static BOOST_CONSTEXPR time_point
min BOOST_PREVENT_MACRO_SUBSTITUTION ()
{
return time_point((duration::min)());
}
- static BOOST_CHRONO_CONSTEXPR time_point
+ static BOOST_CONSTEXPR time_point
max BOOST_PREVENT_MACRO_SUBSTITUTION ()
{
return time_point((duration::max)());
@@ -233,7 +233,7 @@
// time_point operator+(time_point x, duration y);
template <class Clock, class Duration1, class Rep2, class Period2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
time_point<Clock,
typename common_type<Duration1, duration<Rep2, Period2> >::type>
operator+(const time_point<Clock, Duration1>& lhs,
@@ -250,7 +250,7 @@
// time_point operator+(duration x, time_point y);
template <class Rep1, class Period1, class Clock, class Duration2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
time_point<Clock,
typename common_type<duration<Rep1, Period1>, Duration2>::type>
operator+(const duration<Rep1, Period1>& lhs,
@@ -262,7 +262,7 @@
// time_point operator-(time_point x, duration y);
template <class Clock, class Duration1, class Rep2, class Period2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
time_point<Clock,
typename common_type<Duration1, duration<Rep2, Period2> >::type>
operator-(const time_point<Clock, Duration1>& lhs,
@@ -274,7 +274,7 @@
// duration operator-(time_point x, time_point y);
template <class Clock, class Duration1, class Duration2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
typename common_type<Duration1, Duration2>::type
operator-(const time_point<Clock, Duration1>& lhs,
const time_point<Clock, Duration2>& rhs)
@@ -289,7 +289,7 @@
// time_point ==
template <class Clock, class Duration1, class Duration2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
bool
operator==(const time_point<Clock, Duration1>& lhs,
const time_point<Clock, Duration2>& rhs)
@@ -300,7 +300,7 @@
// time_point !=
template <class Clock, class Duration1, class Duration2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
bool
operator!=(const time_point<Clock, Duration1>& lhs,
const time_point<Clock, Duration2>& rhs)
@@ -311,7 +311,7 @@
// time_point <
template <class Clock, class Duration1, class Duration2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
bool
operator<(const time_point<Clock, Duration1>& lhs,
const time_point<Clock, Duration2>& rhs)
@@ -322,7 +322,7 @@
// time_point >
template <class Clock, class Duration1, class Duration2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
bool
operator>(const time_point<Clock, Duration1>& lhs,
const time_point<Clock, Duration2>& rhs)
@@ -333,7 +333,7 @@
// time_point <=
template <class Clock, class Duration1, class Duration2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
bool
operator<=(const time_point<Clock, Duration1>& lhs,
const time_point<Clock, Duration2>& rhs)
@@ -344,7 +344,7 @@
// time_point >=
template <class Clock, class Duration1, class Duration2>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
bool
operator>=(const time_point<Clock, Duration1>& lhs,
const time_point<Clock, Duration2>& rhs)
@@ -357,7 +357,7 @@
//----------------------------------------------------------------------------//
template <class ToDuration, class Clock, class Duration>
- inline BOOST_CHRONO_CONSTEXPR
+ inline BOOST_CONSTEXPR
time_point<Clock, ToDuration>
time_point_cast(const time_point<Clock, Duration>& t)
{
Modified: trunk/libs/chrono/doc/chrono.qbk
==============================================================================
--- trunk/libs/chrono/doc/chrono.qbk (original)
+++ trunk/libs/chrono/doc/chrono.qbk 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
@@ -2486,7 +2486,7 @@
[section:reference Reference ]
[/=================]
-As `constexpr` will not be supported by some compilers, it is replaced in the code by BOOST_CHRONO_CONSTEXPR for constexpr functions and BOOST_CHRONO_STATIC_CONSTEXPR for struct/class static fields. The same applies to `noexecpt` which is replaced by BOOST_CHRONO_NOEXCEPT in the code.
+As `constexpr` will not be supported by some compilers, it is replaced in the code by `BOOST_CONSTEXPR` for `constexpr` functions and `BOOST_STATIC_CONSTEXPR` for struct/class static fields. The same applies to `noexecpt` which is replaced by `BOOST_NOEXCEPT` in the code.
The documentation doesn't use these macros.
@@ -5812,7 +5812,7 @@
* [@http://svn.boost.org/trac/boost/ticket/5979 #5979] Added chrono rounding utilities as defined By Howard Hinnant [@http://home.roadrunner.com/~hinnant/duration_io/chrono_util.html here].
* [@http://svn.boost.org/trac/boost/ticket/5978 #5978] Add BOOST_CHRONO_HAS_PROCESS_CLOCKS to know if process clocks are available.
-* [@http://svn.boost.org/trac/boost/ticket/5978 #5978] Add BOOST_CHRONO_HAS_PROCESS_CLOCKS to know if process clocks are available.
+* [@http://svn.boost.org/trac/boost/ticket/5998 #5998] Make possible to don't provide hybrid error handling.
* [@http://svn.boost.org/trac/boost/ticket/5906 #5906] Take in account the constexpr as defined in the standard.
* [@http://svn.boost.org/trac/boost/ticket/5907 #5907] Take in account noexcept for compilers supporting it.
Modified: trunk/libs/chrono/test/cycle_count.hpp
==============================================================================
--- trunk/libs/chrono/test/cycle_count.hpp (original)
+++ trunk/libs/chrono/test/cycle_count.hpp 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
@@ -22,7 +22,7 @@
typedef long long rep;
typedef boost::chrono::duration<rep, period> duration;
typedef boost::chrono::time_point<cycle_count> time_point;
- BOOST_CHRONO_STATIC_CONSTEXPR bool is_steady = true;
+ BOOST_STATIC_CONSTEXPR bool is_steady = true;
static long long ticks_;
static time_point now()
Modified: trunk/libs/chrono/test/rep.h
==============================================================================
--- trunk/libs/chrono/test/rep.h (original)
+++ trunk/libs/chrono/test/rep.h 2011-10-10 15:27:40 EDT (Mon, 10 Oct 2011)
@@ -34,7 +34,7 @@
template <>
struct numeric_limits<Rep>
{
- static BOOST_CHRONO_CONSTEXPR Rep max BOOST_PREVENT_MACRO_SUBSTITUTION ()
+ static BOOST_CONSTEXPR Rep max BOOST_PREVENT_MACRO_SUBSTITUTION ()
{
return Rep((std::numeric_limits<int>::max)());
}
@@ -47,13 +47,13 @@
template <>
struct duration_values<Rep>
{
- static BOOST_CHRONO_CONSTEXPR Rep zero() {return Rep(0);}
- static BOOST_CHRONO_CONSTEXPR Rep max BOOST_PREVENT_MACRO_SUBSTITUTION ()
+ static BOOST_CONSTEXPR Rep zero() {return Rep(0);}
+ static BOOST_CONSTEXPR Rep max BOOST_PREVENT_MACRO_SUBSTITUTION ()
{
return Rep((std::numeric_limits<int>::max)());
}
- static BOOST_CHRONO_CONSTEXPR Rep min BOOST_PREVENT_MACRO_SUBSTITUTION ()
+ static BOOST_CONSTEXPR Rep min BOOST_PREVENT_MACRO_SUBSTITUTION ()
{
return Rep(detail::numeric_limits<Rep>::lowest());
}
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