diff options
Diffstat (limited to 'libcxx/test/std/utilities/time/time.point')
9 files changed, 27 insertions, 10 deletions
diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cast/time_point_cast.pass.cpp b/libcxx/test/std/utilities/time/time.point/time.point.cast/time_point_cast.pass.cpp index 7d7e82ac5e2..ae5423ef116 100644 --- a/libcxx/test/std/utilities/time/time.point/time.point.cast/time_point_cast.pass.cpp +++ b/libcxx/test/std/utilities/time/time.point/time.point.cast/time_point_cast.pass.cpp @@ -19,6 +19,8 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" + template <class FromDuration, class ToDuration> void test(const FromDuration& df, const ToDuration& d) @@ -35,7 +37,7 @@ test(const FromDuration& df, const ToDuration& d) } } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 template<class FromDuration, long long From, class ToDuration, long long To> void test_constexpr () @@ -65,7 +67,7 @@ int main() 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 +#if TEST_STD_VER > 11 { test_constexpr<std::chrono::milliseconds, 7265000, std::chrono::hours, 2> (); test_constexpr<std::chrono::milliseconds, 7265000, std::chrono::minutes,121> (); diff --git a/libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_equal.pass.cpp b/libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_equal.pass.cpp index a37bb266a0a..a6f7cc0b89b 100644 --- a/libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_equal.pass.cpp +++ b/libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_equal.pass.cpp @@ -22,6 +22,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { typedef std::chrono::system_clock Clock; @@ -55,7 +57,7 @@ int main() assert( (t1 != t2)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr T1 t1(Duration1(3)); constexpr T1 t2(Duration1(3)); diff --git a/libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_less.pass.cpp b/libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_less.pass.cpp index 9d94400ed3d..d7adf29f2ef 100644 --- a/libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_less.pass.cpp +++ b/libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_less.pass.cpp @@ -30,6 +30,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { typedef std::chrono::system_clock Clock; @@ -71,7 +73,7 @@ int main() assert(!(t1 >= t2)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr T1 t1(Duration1(3)); constexpr T1 t2(Duration1(3)); diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cons/convert.pass.cpp b/libcxx/test/std/utilities/time/time.point/time.point.cons/convert.pass.cpp index 6cd7dcb7d2f..33e349fe894 100644 --- a/libcxx/test/std/utilities/time/time.point/time.point.cons/convert.pass.cpp +++ b/libcxx/test/std/utilities/time/time.point/time.point.cons/convert.pass.cpp @@ -17,6 +17,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { typedef std::chrono::system_clock Clock; @@ -27,7 +29,7 @@ int main() std::chrono::time_point<Clock, Duration1> t1 = t2; assert(t1.time_since_epoch() == Duration1(3000)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::chrono::time_point<Clock, Duration2> t2(Duration2(3)); constexpr std::chrono::time_point<Clock, Duration1> t1 = t2; diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cons/default.pass.cpp b/libcxx/test/std/utilities/time/time.point/time.point.cons/default.pass.cpp index 01f0bc16993..120fd3fb4e9 100644 --- a/libcxx/test/std/utilities/time/time.point/time.point.cons/default.pass.cpp +++ b/libcxx/test/std/utilities/time/time.point/time.point.cons/default.pass.cpp @@ -16,6 +16,7 @@ #include <chrono> #include <cassert> +#include "test_macros.h" #include "../../rep.h" int main() @@ -26,7 +27,7 @@ int main() std::chrono::time_point<Clock, Duration> t; assert(t.time_since_epoch() == Duration::zero()); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::chrono::time_point<Clock, Duration> t; static_assert(t.time_since_epoch() == Duration::zero(), ""); diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cons/duration.pass.cpp b/libcxx/test/std/utilities/time/time.point/time.point.cons/duration.pass.cpp index 9d53d86dea3..1b96902aba3 100644 --- a/libcxx/test/std/utilities/time/time.point/time.point.cons/duration.pass.cpp +++ b/libcxx/test/std/utilities/time/time.point/time.point.cons/duration.pass.cpp @@ -16,6 +16,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { typedef std::chrono::system_clock Clock; @@ -28,7 +30,7 @@ int main() std::chrono::time_point<Clock, Duration> t(std::chrono::seconds(3)); assert(t.time_since_epoch() == Duration(3000)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::chrono::time_point<Clock, Duration> t(Duration(3)); static_assert(t.time_since_epoch() == Duration(3), ""); diff --git a/libcxx/test/std/utilities/time/time.point/time.point.nonmember/op_+.pass.cpp b/libcxx/test/std/utilities/time/time.point/time.point.nonmember/op_+.pass.cpp index 7a8fa6dcf14..19f5cbcd9f4 100644 --- a/libcxx/test/std/utilities/time/time.point/time.point.nonmember/op_+.pass.cpp +++ b/libcxx/test/std/utilities/time/time.point/time.point.nonmember/op_+.pass.cpp @@ -22,6 +22,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { typedef std::chrono::system_clock Clock; @@ -34,7 +36,7 @@ int main() t2 = Duration2(6) + t1; assert(t2.time_since_epoch() == Duration2(3006)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::chrono::time_point<Clock, Duration1> t1(Duration1(3)); constexpr std::chrono::time_point<Clock, Duration2> t2 = t1 + Duration2(5); diff --git a/libcxx/test/std/utilities/time/time.point/time.point.nonmember/op_-duration.pass.cpp b/libcxx/test/std/utilities/time/time.point/time.point.nonmember/op_-duration.pass.cpp index 342d27b5aeb..4c681fa32e5 100644 --- a/libcxx/test/std/utilities/time/time.point/time.point.nonmember/op_-duration.pass.cpp +++ b/libcxx/test/std/utilities/time/time.point/time.point.nonmember/op_-duration.pass.cpp @@ -18,6 +18,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { typedef std::chrono::system_clock Clock; @@ -28,7 +30,7 @@ int main() std::chrono::time_point<Clock, Duration2> t2 = t1 - Duration2(5); assert(t2.time_since_epoch() == Duration2(2995)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::chrono::time_point<Clock, Duration1> t1(Duration1(3)); constexpr std::chrono::time_point<Clock, Duration2> t2 = t1 - Duration2(5); diff --git a/libcxx/test/std/utilities/time/time.point/time.point.nonmember/op_-time_point.pass.cpp b/libcxx/test/std/utilities/time/time.point/time.point.nonmember/op_-time_point.pass.cpp index 5267f07e1b8..fcef3f24973 100644 --- a/libcxx/test/std/utilities/time/time.point/time.point.nonmember/op_-time_point.pass.cpp +++ b/libcxx/test/std/utilities/time/time.point/time.point.nonmember/op_-time_point.pass.cpp @@ -18,6 +18,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { typedef std::chrono::system_clock Clock; @@ -28,7 +30,7 @@ int main() std::chrono::time_point<Clock, Duration2> t2(Duration2(5)); assert((t1 - t2) == Duration2(2995)); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::chrono::time_point<Clock, Duration1> t1(Duration1(3)); constexpr std::chrono::time_point<Clock, Duration2> t2(Duration2(5)); |
