Implement n3469 - constexpr for chrono
llvm-svn: 187517
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: a1d0d376c88d46c942dead9e0b664978d0a8d587
diff --git a/include/chrono b/include/chrono
index 219e20e..08c40b5 100644
--- a/include/chrono
+++ b/include/chrono
@@ -111,16 +111,16 @@
duration d_; // exposition only
public:
- time_point(); // has value "epoch"
- explicit time_point(const duration& d); // same as time_point() + d
+ time_point(); // has value "epoch" // constexpr in C++14
+ explicit time_point(const duration& d); // same as time_point() + d // constexpr in C++14
// conversions
template <class Duration2>
- time_point(const time_point<clock, Duration2>& t);
+ time_point(const time_point<clock, Duration2>& t); // constexpr in C++14
// observer
- duration time_since_epoch() const;
+ duration time_since_epoch() const; // constexpr in C++14
// arithmetic
@@ -194,7 +194,7 @@
template <class ToDuration, class Rep, class Period>
ToDuration duration_cast(const duration<Rep, Period>& d);
-// time_point arithmetic
+// time_point arithmetic (all constexpr in C++14)
template <class Clock, class Duration1, class Rep2, class Period2>
time_point<Clock, typename common_type<Duration1, duration<Rep2, Period2>>::type>
operator+(const time_point<Clock, Duration1>& lhs, const duration<Rep2, Period2>& rhs);
@@ -208,7 +208,7 @@
typename common_type<Duration1, Duration2>::type
operator-(const time_point<Clock, Duration1>& lhs, const time_point<Clock, Duration2>& rhs);
-// time_point comparisons
+// time_point comparisons (all constexpr in C++14)
template <class Clock, class Duration1, class Duration2>
bool operator==(const time_point<Clock, Duration1>& lhs, const time_point<Clock, Duration2>& rhs);
template <class Clock, class Duration1, class Duration2>
@@ -222,7 +222,7 @@
template <class Clock, class Duration1, class Duration2>
bool operator>=(const time_point<Clock, Duration1>& lhs, const time_point<Clock, Duration2>& rhs);
-// time_point_cast
+// time_point_cast (constexpr in C++14)
template <class ToDuration, class Clock, class Duration>
time_point<Clock, ToDuration> time_point_cast(const time_point<Clock, Duration>& t);
@@ -236,7 +236,7 @@
typedef duration::rep rep;
typedef duration::period period;
typedef chrono::time_point<system_clock> time_point;
- static const bool is_steady = false;
+ static const bool is_steady = false; // constexpr in C++14
static time_point now() noexcept;
static time_t to_time_t (const time_point& __t) noexcept;
@@ -250,7 +250,7 @@
typedef duration::rep rep;
typedef duration::period period;
typedef chrono::time_point<steady_clock, duration> time_point;
- static const bool is_steady = true;
+ static const bool is_steady = true; // constexpr in C++14
static time_point now() noexcept;
};
@@ -416,7 +416,13 @@
rep __rep_;
public:
- _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR duration() {} // = default;
+ _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
+#ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
+ duration() {}
+#else
+ duration() = default;
+#endif
+
template <class _Rep2>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
explicit duration(const _Rep2& __r,
@@ -722,12 +728,12 @@
duration __d_;
public:
- _LIBCPP_INLINE_VISIBILITY time_point() : __d_(duration::zero()) {}
- _LIBCPP_INLINE_VISIBILITY explicit time_point(const duration& __d) : __d_(__d) {}
+ _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 time_point() : __d_(duration::zero()) {}
+ _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 explicit time_point(const duration& __d) : __d_(__d) {}
// conversions
template <class _Duration2>
- _LIBCPP_INLINE_VISIBILITY
+ _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
time_point(const time_point<clock, _Duration2>& t,
typename enable_if
<
@@ -737,7 +743,7 @@
// observer
- _LIBCPP_INLINE_VISIBILITY duration time_since_epoch() const {return __d_;}
+ _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 duration time_since_epoch() const {return __d_;}
// arithmetic
@@ -762,7 +768,7 @@
namespace chrono {
template <class _ToDuration, class _Clock, class _Duration>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
time_point<_Clock, _ToDuration>
time_point_cast(const time_point<_Clock, _Duration>& __t)
{
@@ -772,7 +778,7 @@
// time_point ==
template <class _Clock, class _Duration1, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
bool
operator==(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
{
@@ -782,7 +788,7 @@
// time_point !=
template <class _Clock, class _Duration1, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
bool
operator!=(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
{
@@ -792,7 +798,7 @@
// time_point <
template <class _Clock, class _Duration1, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
bool
operator<(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
{
@@ -802,7 +808,7 @@
// time_point >
template <class _Clock, class _Duration1, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
bool
operator>(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
{
@@ -812,7 +818,7 @@
// time_point <=
template <class _Clock, class _Duration1, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
bool
operator<=(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
{
@@ -822,7 +828,7 @@
// time_point >=
template <class _Clock, class _Duration1, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
bool
operator>=(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
{
@@ -832,20 +838,18 @@
// time_point operator+(time_point x, duration y);
template <class _Clock, class _Duration1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
time_point<_Clock, typename common_type<_Duration1, duration<_Rep2, _Period2> >::type>
operator+(const time_point<_Clock, _Duration1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
{
typedef time_point<_Clock, typename common_type<_Duration1, duration<_Rep2, _Period2> >::type> _Tr;
- _Tr __r(__lhs.time_since_epoch());
- __r += __rhs;
- return __r;
+ return _Tr (__lhs.time_since_epoch() + __rhs);
}
// time_point operator+(duration x, time_point y);
template <class _Rep1, class _Period1, class _Clock, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
time_point<_Clock, typename common_type<duration<_Rep1, _Period1>, _Duration2>::type>
operator+(const duration<_Rep1, _Period1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
{
@@ -855,7 +859,7 @@
// time_point operator-(time_point x, duration y);
template <class _Clock, class _Duration1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
time_point<_Clock, typename common_type<_Duration1, duration<_Rep2, _Period2> >::type>
operator-(const time_point<_Clock, _Duration1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
{
@@ -865,7 +869,7 @@
// duration operator-(time_point x, time_point y);
template <class _Clock, class _Duration1, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY
+inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
typename common_type<_Duration1, _Duration2>::type
operator-(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
{
@@ -883,7 +887,7 @@
typedef duration::rep rep;
typedef duration::period period;
typedef chrono::time_point<system_clock> time_point;
- static const bool is_steady = false;
+ static _LIBCPP_CONSTEXPR_AFTER_CXX11 const bool is_steady = false;
static time_point now() _NOEXCEPT;
static time_t to_time_t (const time_point& __t) _NOEXCEPT;
@@ -897,7 +901,7 @@
typedef duration::rep rep;
typedef duration::period period;
typedef chrono::time_point<steady_clock, duration> time_point;
- static const bool is_steady = true;
+ static _LIBCPP_CONSTEXPR_AFTER_CXX11 const bool is_steady = true;
static time_point now() _NOEXCEPT;
};
diff --git a/test/utilities/time/time.point/time.point.cast/time_point_cast.pass.cpp b/test/utilities/time/time.point/time.point.cast/time_point_cast.pass.cpp
index 592993c..04b4367 100644
--- a/test/utilities/time/time.point/time.point.cast/time_point_cast.pass.cpp
+++ b/test/utilities/time/time.point/time.point.cast/time_point_cast.pass.cpp
@@ -26,11 +26,27 @@
typedef std::chrono::system_clock Clock;
typedef std::chrono::time_point<Clock, FromDuration> FromTimePoint;
typedef std::chrono::time_point<Clock, ToDuration> ToTimePoint;
+ {
FromTimePoint f(df);
ToTimePoint t(d);
typedef decltype(std::chrono::time_point_cast<ToDuration>(f)) R;
static_assert((std::is_same<R, ToTimePoint>::value), "");
assert(std::chrono::time_point_cast<ToDuration>(f) == t);
+ }
+}
+
+template<class FromDuration, long long From, class ToDuration, long long To>
+void test_constexpr ()
+{
+ typedef std::chrono::system_clock Clock;
+ typedef std::chrono::time_point<Clock, FromDuration> FromTimePoint;
+ typedef std::chrono::time_point<Clock, ToDuration> ToTimePoint;
+ {
+ constexpr FromTimePoint f{FromDuration{From}};
+ constexpr ToTimePoint t{ToDuration{To}};
+ static_assert(std::chrono::time_point_cast<ToDuration>(f) == t, "");
+ }
+
}
int main()
@@ -45,4 +61,16 @@
std::chrono::duration<double, std::ratio<3600> >(7265./3600));
test(std::chrono::duration<int, std::ratio<2, 3> >(9),
std::chrono::duration<int, std::ratio<3, 5> >(10));
+#if _LIBCPP_STD_VER > 11
+ {
+ test_constexpr<std::chrono::milliseconds, 7265000, std::chrono::hours, 2> ();
+ test_constexpr<std::chrono::milliseconds, 7265000, std::chrono::minutes,121> ();
+ test_constexpr<std::chrono::milliseconds, 7265000, std::chrono::seconds,7265> ();
+ test_constexpr<std::chrono::milliseconds, 7265000, std::chrono::milliseconds,7265000> ();
+ test_constexpr<std::chrono::milliseconds, 7265000, std::chrono::microseconds,7265000000LL> ();
+ test_constexpr<std::chrono::milliseconds, 7265000, std::chrono::nanoseconds,7265000000000LL> ();
+ typedef std::chrono::duration<int, std::ratio<3, 5>> T1;
+ test_constexpr<std::chrono::duration<int, std::ratio<2, 3>>, 9, T1, 10> ();
+ }
+#endif
}
diff --git a/test/utilities/time/time.point/time.point.comparisons/op_equal.pass.cpp b/test/utilities/time/time.point/time.point.comparisons/op_equal.pass.cpp
index 8c415a7..fbd3a13 100644
--- a/test/utilities/time/time.point/time.point.comparisons/op_equal.pass.cpp
+++ b/test/utilities/time/time.point/time.point.comparisons/op_equal.pass.cpp
@@ -54,4 +54,31 @@
assert(!(t1 == t2));
assert( (t1 != t2));
}
+
+#if _LIBCPP_STD_VER > 11
+ {
+ constexpr T1 t1(Duration1(3));
+ constexpr T1 t2(Duration1(3));
+ static_assert( (t1 == t2), "");
+ static_assert(!(t1 != t2), "");
+ }
+ {
+ constexpr T1 t1(Duration1(3));
+ constexpr T1 t2(Duration1(4));
+ static_assert(!(t1 == t2), "");
+ static_assert( (t1 != t2), "");
+ }
+ {
+ constexpr T1 t1(Duration1(3));
+ constexpr T2 t2(Duration2(3000));
+ static_assert( (t1 == t2), "");
+ static_assert(!(t1 != t2), "");
+ }
+ {
+ constexpr T1 t1(Duration1(3));
+ constexpr T2 t2(Duration2(3001));
+ static_assert(!(t1 == t2), "");
+ static_assert( (t1 != t2), "");
+ }
+#endif
}
diff --git a/test/utilities/time/time.point/time.point.comparisons/op_less.pass.cpp b/test/utilities/time/time.point/time.point.comparisons/op_less.pass.cpp
index f763cfe..9d94400 100644
--- a/test/utilities/time/time.point/time.point.comparisons/op_less.pass.cpp
+++ b/test/utilities/time/time.point/time.point.comparisons/op_less.pass.cpp
@@ -70,4 +70,39 @@
assert( (t1 <= t2));
assert(!(t1 >= t2));
}
+
+#if _LIBCPP_STD_VER > 11
+ {
+ constexpr T1 t1(Duration1(3));
+ constexpr T1 t2(Duration1(3));
+ static_assert(!(t1 < t2), "");
+ static_assert(!(t1 > t2), "");
+ static_assert( (t1 <= t2), "");
+ static_assert( (t1 >= t2), "");
+ }
+ {
+ constexpr T1 t1(Duration1(3));
+ constexpr T1 t2(Duration1(4));
+ static_assert( (t1 < t2), "");
+ static_assert(!(t1 > t2), "");
+ static_assert( (t1 <= t2), "");
+ static_assert(!(t1 >= t2), "");
+ }
+ {
+ constexpr T1 t1(Duration1(3));
+ constexpr T2 t2(Duration2(3000));
+ static_assert(!(t1 < t2), "");
+ static_assert(!(t1 > t2), "");
+ static_assert( (t1 <= t2), "");
+ static_assert( (t1 >= t2), "");
+ }
+ {
+ constexpr T1 t1(Duration1(3));
+ constexpr T2 t2(Duration2(3001));
+ static_assert( (t1 < t2), "");
+ static_assert(!(t1 > t2), "");
+ static_assert( (t1 <= t2), "");
+ static_assert(!(t1 >= t2), "");
+ }
+#endif
}
diff --git a/test/utilities/time/time.point/time.point.cons/convert.pass.cpp b/test/utilities/time/time.point/time.point.cons/convert.pass.cpp
index ed42d3e..6cd7dcb 100644
--- a/test/utilities/time/time.point/time.point.cons/convert.pass.cpp
+++ b/test/utilities/time/time.point/time.point.cons/convert.pass.cpp
@@ -27,4 +27,11 @@
std::chrono::time_point<Clock, Duration1> t1 = t2;
assert(t1.time_since_epoch() == Duration1(3000));
}
+#if _LIBCPP_STD_VER > 11
+ {
+ constexpr std::chrono::time_point<Clock, Duration2> t2(Duration2(3));
+ constexpr std::chrono::time_point<Clock, Duration1> t1 = t2;
+ static_assert(t1.time_since_epoch() == Duration1(3000), "");
+ }
+#endif
}
diff --git a/test/utilities/time/time.point/time.point.cons/default.pass.cpp b/test/utilities/time/time.point/time.point.cons/default.pass.cpp
index 9148e6a..01f0bc1 100644
--- a/test/utilities/time/time.point/time.point.cons/default.pass.cpp
+++ b/test/utilities/time/time.point/time.point.cons/default.pass.cpp
@@ -22,6 +22,14 @@
{
typedef std::chrono::system_clock Clock;
typedef std::chrono::duration<Rep, std::milli> Duration;
+ {
std::chrono::time_point<Clock, Duration> t;
assert(t.time_since_epoch() == Duration::zero());
+ }
+#if _LIBCPP_STD_VER > 11
+ {
+ constexpr std::chrono::time_point<Clock, Duration> t;
+ static_assert(t.time_since_epoch() == Duration::zero(), "");
+ }
+#endif
}
diff --git a/test/utilities/time/time.point/time.point.cons/duration.pass.cpp b/test/utilities/time/time.point/time.point.cons/duration.pass.cpp
index d0519bc..9d53d86 100644
--- a/test/utilities/time/time.point/time.point.cons/duration.pass.cpp
+++ b/test/utilities/time/time.point/time.point.cons/duration.pass.cpp
@@ -28,4 +28,14 @@
std::chrono::time_point<Clock, Duration> t(std::chrono::seconds(3));
assert(t.time_since_epoch() == Duration(3000));
}
+#if _LIBCPP_STD_VER > 11
+ {
+ constexpr std::chrono::time_point<Clock, Duration> t(Duration(3));
+ static_assert(t.time_since_epoch() == Duration(3), "");
+ }
+ {
+ constexpr std::chrono::time_point<Clock, Duration> t(std::chrono::seconds(3));
+ static_assert(t.time_since_epoch() == Duration(3000), "");
+ }
+#endif
}
diff --git a/test/utilities/time/time.point/time.point.nonmember/op_+.pass.cpp b/test/utilities/time/time.point/time.point.nonmember/op_+.pass.cpp
index 37f2dc1..7a8fa6d 100644
--- a/test/utilities/time/time.point/time.point.nonmember/op_+.pass.cpp
+++ b/test/utilities/time/time.point/time.point.nonmember/op_+.pass.cpp
@@ -27,9 +27,20 @@
typedef std::chrono::system_clock Clock;
typedef std::chrono::milliseconds Duration1;
typedef std::chrono::microseconds Duration2;
+ {
std::chrono::time_point<Clock, Duration1> t1(Duration1(3));
std::chrono::time_point<Clock, Duration2> t2 = t1 + Duration2(5);
assert(t2.time_since_epoch() == Duration2(3005));
t2 = Duration2(6) + t1;
assert(t2.time_since_epoch() == Duration2(3006));
+ }
+#if _LIBCPP_STD_VER > 11
+ {
+ constexpr std::chrono::time_point<Clock, Duration1> t1(Duration1(3));
+ constexpr std::chrono::time_point<Clock, Duration2> t2 = t1 + Duration2(5);
+ static_assert(t2.time_since_epoch() == Duration2(3005), "");
+ constexpr std::chrono::time_point<Clock, Duration2> t3 = Duration2(6) + t1;
+ static_assert(t3.time_since_epoch() == Duration2(3006), "");
+ }
+#endif
}
diff --git a/test/utilities/time/time.point/time.point.nonmember/op_-duration.pass.cpp b/test/utilities/time/time.point/time.point.nonmember/op_-duration.pass.cpp
index d52d359..342d27b 100644
--- a/test/utilities/time/time.point/time.point.nonmember/op_-duration.pass.cpp
+++ b/test/utilities/time/time.point/time.point.nonmember/op_-duration.pass.cpp
@@ -23,7 +23,16 @@
typedef std::chrono::system_clock Clock;
typedef std::chrono::milliseconds Duration1;
typedef std::chrono::microseconds Duration2;
+ {
std::chrono::time_point<Clock, Duration1> t1(Duration1(3));
std::chrono::time_point<Clock, Duration2> t2 = t1 - Duration2(5);
assert(t2.time_since_epoch() == Duration2(2995));
+ }
+#if _LIBCPP_STD_VER > 11
+ {
+ constexpr std::chrono::time_point<Clock, Duration1> t1(Duration1(3));
+ constexpr std::chrono::time_point<Clock, Duration2> t2 = t1 - Duration2(5);
+ static_assert(t2.time_since_epoch() == Duration2(2995), "");
+ }
+#endif
}
diff --git a/test/utilities/time/time.point/time.point.nonmember/op_-time_point.pass.cpp b/test/utilities/time/time.point/time.point.nonmember/op_-time_point.pass.cpp
index ee934a1..5267f07 100644
--- a/test/utilities/time/time.point/time.point.nonmember/op_-time_point.pass.cpp
+++ b/test/utilities/time/time.point/time.point.nonmember/op_-time_point.pass.cpp
@@ -23,7 +23,16 @@
typedef std::chrono::system_clock Clock;
typedef std::chrono::milliseconds Duration1;
typedef std::chrono::microseconds Duration2;
+ {
std::chrono::time_point<Clock, Duration1> t1(Duration1(3));
std::chrono::time_point<Clock, Duration2> t2(Duration2(5));
assert((t1 - t2) == Duration2(2995));
+ }
+#if _LIBCPP_STD_VER > 11
+ {
+ constexpr std::chrono::time_point<Clock, Duration1> t1(Duration1(3));
+ constexpr std::chrono::time_point<Clock, Duration2> t2(Duration2(5));
+ static_assert((t1 - t2) == Duration2(2995), "");
+ }
+#endif
}