Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-19 20:22:58 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2014-10-20 13:49:33 (GMT) |
| commit | 6b22dfcf59474dd016a0355a3102a1dd3692d92c (patch) | |
| tree | 2b1fd33be433a91e81fee84fdc2bf1b52575d934 /3rdParty/Boost/src/boost/chrono/duration.hpp | |
| parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
| download | swift-contrib-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-contrib-6b22dfcf59474dd016a0355a3102a1dd3692d92c.tar.bz2 | |
Update Boost in 3rdParty to version 1.56.0.
This updates Boost in our 3rdParty directory to version 1.56.0.
Updated our update.sh script to stop on error.
Changed error reporting in SwiftTools/CrashReporter.cpp to SWIFT_LOG due to
missing include of <iostream> with newer Boost.
Change-Id: I4b35c77de951333979a524097f35f5f83d325edc
Diffstat (limited to '3rdParty/Boost/src/boost/chrono/duration.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/chrono/duration.hpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/3rdParty/Boost/src/boost/chrono/duration.hpp b/3rdParty/Boost/src/boost/chrono/duration.hpp index 97fe3d7..814adb0 100644 --- a/3rdParty/Boost/src/boost/chrono/duration.hpp +++ b/3rdParty/Boost/src/boost/chrono/duration.hpp @@ -385,116 +385,115 @@ struct duration_values { return (std::numeric_limits<Rep>::max)(); } static BOOST_CHRONO_LIB_CONSTEXPR Rep min BOOST_PREVENT_MACRO_SUBSTITUTION () { return detail::numeric_limits<Rep>::lowest(); } }; } // namespace chrono //----------------------------------------------------------------------------// // 20.9.2.3 Specializations of common_type [time.traits.specializations] // //----------------------------------------------------------------------------// template <class Rep1, class Period1, class Rep2, class Period2> struct common_type<chrono::duration<Rep1, Period1>, chrono::duration<Rep2, Period2> > { typedef chrono::duration<typename common_type<Rep1, Rep2>::type, typename boost::ratio_gcd<Period1, Period2>::type> type; }; //----------------------------------------------------------------------------// // // // 20.9.3 Class template duration [time.duration] // // // //----------------------------------------------------------------------------// namespace chrono { template <class Rep, class Period> - class duration + class BOOST_SYMBOL_VISIBLE duration { //BOOST_CHRONO_STATIC_ASSERT(boost::is_integral<Rep>::value, BOOST_CHRONO_A_DURATION_REPRESENTATION_MUST_BE_INTEGRAL, ()); BOOST_CHRONO_STATIC_ASSERT(!boost::chrono::detail::is_duration<Rep>::value, BOOST_CHRONO_A_DURATION_REPRESENTATION_CAN_NOT_BE_A_DURATION, ()); BOOST_CHRONO_STATIC_ASSERT(boost::ratio_detail::is_ratio<typename Period::type>::value, BOOST_CHRONO_SECOND_TEMPLATE_PARAMETER_OF_DURATION_MUST_BE_A_STD_RATIO, ()); BOOST_CHRONO_STATIC_ASSERT(Period::num>0, BOOST_CHRONO_DURATION_PERIOD_MUST_BE_POSITIVE, ()); public: typedef Rep rep; typedef Period period; private: rep rep_; public: - BOOST_CONSTEXPR + BOOST_FORCEINLINE BOOST_CONSTEXPR duration() : rep_(duration_values<rep>::zero()) { } template <class Rep2> - BOOST_CONSTEXPR + BOOST_SYMBOL_VISIBLE BOOST_FORCEINLINE BOOST_CONSTEXPR explicit duration(const Rep2& r , typename boost::enable_if < mpl::and_ < boost::is_convertible<Rep2, rep>, mpl::or_ < treat_as_floating_point<rep>, mpl::and_ < mpl::not_ < treat_as_floating_point<rep> >, mpl::not_ < treat_as_floating_point<Rep2> > > > > >::type* = 0 ) : rep_(r) { } //~duration() {} //= default; - //BOOST_CONSTEXPR - //duration(const duration& rhs) : rep_(rhs.rep_) {} // = default; +// BOOST_CONSTEXPR duration(const duration& rhs) : rep_(rhs.rep_) {} // = default; duration& operator=(const duration& rhs) // = default; { if (&rhs != this) rep_= rhs.rep_; return *this; } // conversions template <class Rep2, class Period2> - BOOST_CONSTEXPR + BOOST_FORCEINLINE BOOST_CONSTEXPR duration(const duration<Rep2, Period2>& d , typename boost::enable_if < mpl::or_ < treat_as_floating_point<rep>, mpl::and_ < chrono_detail::is_evenly_divisible_by<Period2, period>, mpl::not_ < treat_as_floating_point<Rep2> > > > >::type* = 0 ) : rep_(chrono::detail::duration_cast<duration<Rep2, Period2>, duration>()(d).count()) {} // observer BOOST_CONSTEXPR rep count() const {return rep_;} // arithmetic BOOST_CONSTEXPR duration operator+() const {return duration(rep_);;} BOOST_CONSTEXPR duration operator-() const {return duration(-rep_);} duration& operator++() {++rep_; return *this;} duration operator++(int) {return duration(rep_++);} duration& operator--() {--rep_; return *this;} duration operator--(int) {return duration(rep_--);} duration& operator+=(const duration& d) { rep_ += d.count(); return *this; } duration& operator-=(const duration& d) { @@ -632,100 +631,100 @@ namespace chrono { template <class Rep1, class Period, class Rep2> 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 >::type operator%(const duration<Rep1, Period>& d, const Rep2& s) { typedef typename common_type<Rep1, Rep2>::type CR; typedef duration<CR, Period> CD; return CD(CD(d).count()%static_cast<CR>(s)); } template <class Rep1, class Period1, class Rep2, class Period2> inline BOOST_CONSTEXPR typename common_type<duration<Rep1, Period1>, duration<Rep2, Period2> >::type operator%(const duration<Rep1, Period1>& lhs, const duration<Rep2, Period2>& rhs) { typedef typename common_type<duration<Rep1, Period1>, duration<Rep2, Period2> >::type CD; return CD(CD(lhs).count()%CD(rhs).count()); } //----------------------------------------------------------------------------// // 20.9.3.6 duration comparisons [time.duration.comparisons] // //----------------------------------------------------------------------------// namespace detail { 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(); } }; 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(); } }; 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(); } }; 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(); } }; } // namespace detail // Duration == template <class Rep1, class Period1, class Rep2, class Period2> inline BOOST_CONSTEXPR bool operator==(const duration<Rep1, Period1>& lhs, const duration<Rep2, Period2>& rhs) { return boost::chrono::detail::duration_eq< duration<Rep1, Period1>, duration<Rep2, Period2> >()(lhs, rhs); } // Duration != template <class Rep1, class Period1, class Rep2, class Period2> inline BOOST_CONSTEXPR bool operator!=(const duration<Rep1, Period1>& lhs, const duration<Rep2, Period2>& rhs) { return !(lhs == rhs); } // Duration < template <class Rep1, class Period1, class Rep2, class Period2> inline BOOST_CONSTEXPR bool |