Mercurial > hg > vamp-build-and-test
diff DEPENDENCIES/generic/include/boost/chrono/duration.hpp @ 101:c530137014c0
Update Boost headers (1.58.0)
author | Chris Cannam |
---|---|
date | Mon, 07 Sep 2015 11:12:49 +0100 |
parents | 2665513ce2d3 |
children |
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/chrono/duration.hpp Fri Sep 04 12:01:02 2015 +0100 +++ b/DEPENDENCIES/generic/include/boost/chrono/duration.hpp Mon Sep 07 11:12:49 2015 +0100 @@ -433,8 +433,12 @@ rep rep_; public: +#if defined BOOST_NO_CXX11_DEFAULTED_FUNCTIONS BOOST_FORCEINLINE BOOST_CONSTEXPR duration() : rep_(duration_values<rep>::zero()) { } +#else + BOOST_CONSTEXPR duration() BOOST_NOEXCEPT {}; +#endif template <class Rep2> BOOST_SYMBOL_VISIBLE BOOST_FORCEINLINE BOOST_CONSTEXPR explicit duration(const Rep2& r @@ -451,14 +455,15 @@ > >::type* = 0 ) : rep_(r) { } - //~duration() {} //= default; -// BOOST_CONSTEXPR duration(const duration& rhs) : rep_(rhs.rep_) {} // = default; - duration& operator=(const duration& rhs) // = default; +#if defined BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + duration& operator=(const duration& rhs) { if (&rhs != this) rep_= rhs.rep_; return *this; } - +#else + duration& operator=(const duration& rhs) = default; +#endif // conversions template <class Rep2, class Period2> BOOST_FORCEINLINE BOOST_CONSTEXPR