Mercurial > hg > vamp-build-and-test
comparison 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 |
comparison
equal
deleted
inserted
replaced
100:793467b5e61c | 101:c530137014c0 |
---|---|
431 typedef Period period; | 431 typedef Period period; |
432 private: | 432 private: |
433 rep rep_; | 433 rep rep_; |
434 public: | 434 public: |
435 | 435 |
436 #if defined BOOST_NO_CXX11_DEFAULTED_FUNCTIONS | |
436 BOOST_FORCEINLINE BOOST_CONSTEXPR | 437 BOOST_FORCEINLINE BOOST_CONSTEXPR |
437 duration() : rep_(duration_values<rep>::zero()) { } | 438 duration() : rep_(duration_values<rep>::zero()) { } |
439 #else | |
440 BOOST_CONSTEXPR duration() BOOST_NOEXCEPT {}; | |
441 #endif | |
438 template <class Rep2> | 442 template <class Rep2> |
439 BOOST_SYMBOL_VISIBLE BOOST_FORCEINLINE BOOST_CONSTEXPR | 443 BOOST_SYMBOL_VISIBLE BOOST_FORCEINLINE BOOST_CONSTEXPR |
440 explicit duration(const Rep2& r | 444 explicit duration(const Rep2& r |
441 , typename boost::enable_if < | 445 , typename boost::enable_if < |
442 mpl::and_ < | 446 mpl::and_ < |
449 > | 453 > |
450 > | 454 > |
451 > | 455 > |
452 >::type* = 0 | 456 >::type* = 0 |
453 ) : rep_(r) { } | 457 ) : rep_(r) { } |
454 //~duration() {} //= default; | 458 #if defined BOOST_NO_CXX11_DEFAULTED_FUNCTIONS |
455 // BOOST_CONSTEXPR duration(const duration& rhs) : rep_(rhs.rep_) {} // = default; | 459 duration& operator=(const duration& rhs) |
456 duration& operator=(const duration& rhs) // = default; | |
457 { | 460 { |
458 if (&rhs != this) rep_= rhs.rep_; | 461 if (&rhs != this) rep_= rhs.rep_; |
459 return *this; | 462 return *this; |
460 } | 463 } |
461 | 464 #else |
465 duration& operator=(const duration& rhs) = default; | |
466 #endif | |
462 // conversions | 467 // conversions |
463 template <class Rep2, class Period2> | 468 template <class Rep2, class Period2> |
464 BOOST_FORCEINLINE BOOST_CONSTEXPR | 469 BOOST_FORCEINLINE BOOST_CONSTEXPR |
465 duration(const duration<Rep2, Period2>& d | 470 duration(const duration<Rep2, Period2>& d |
466 , typename boost::enable_if < | 471 , typename boost::enable_if < |