diff options
Diffstat (limited to 'test/std/utilities/time/time.duration')
21 files changed, 54 insertions, 21 deletions
diff --git a/test/std/utilities/time/time.duration/time.duration.arithmetic/op_+.pass.cpp b/test/std/utilities/time/time.duration/time.duration.arithmetic/op_+.pass.cpp index b85f039526a4b..37753bcad0d1c 100644 --- a/test/std/utilities/time/time.duration/time.duration.arithmetic/op_+.pass.cpp +++ b/test/std/utilities/time/time.duration/time.duration.arithmetic/op_+.pass.cpp @@ -16,7 +16,7 @@ #include <chrono> #include <cassert> -#include <test_macros.h> +#include "test_macros.h" int main() { diff --git a/test/std/utilities/time/time.duration/time.duration.arithmetic/op_-.pass.cpp b/test/std/utilities/time/time.duration/time.duration.arithmetic/op_-.pass.cpp index 347cc1980e819..f932eb51c0d53 100644 --- a/test/std/utilities/time/time.duration/time.duration.arithmetic/op_-.pass.cpp +++ b/test/std/utilities/time/time.duration/time.duration.arithmetic/op_-.pass.cpp @@ -16,7 +16,7 @@ #include <chrono> #include <cassert> -#include <test_macros.h> +#include "test_macros.h" int main() { diff --git a/test/std/utilities/time/time.duration/time.duration.cast/duration_cast.pass.cpp b/test/std/utilities/time/time.duration/time.duration.cast/duration_cast.pass.cpp index 1c87fcd909efc..9ecdfc750ab01 100644 --- a/test/std/utilities/time/time.duration/time.duration.cast/duration_cast.pass.cpp +++ b/test/std/utilities/time/time.duration/time.duration.cast/duration_cast.pass.cpp @@ -20,6 +20,8 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" + template <class ToDuration, class FromDuration> void test(const FromDuration& f, const ToDuration& d) @@ -43,7 +45,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)); -#ifndef _LIBCPP_HAS_NO_CONSTEXPR +#if TEST_STD_VER >= 11 { constexpr std::chrono::hours h = std::chrono::duration_cast<std::chrono::hours>(std::chrono::milliseconds(7265000)); static_assert(h.count() == 2, ""); diff --git a/test/std/utilities/time/time.duration/time.duration.comparisons/op_equal.pass.cpp b/test/std/utilities/time/time.duration/time.duration.comparisons/op_equal.pass.cpp index 2d0dd94d4cf65..5adc62ff1c5f1 100644 --- a/test/std/utilities/time/time.duration/time.duration.comparisons/op_equal.pass.cpp +++ b/test/std/utilities/time/time.duration/time.duration.comparisons/op_equal.pass.cpp @@ -24,6 +24,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { { @@ -68,7 +70,7 @@ int main() assert(s1 == s2); assert(!(s1 != s2)); } -#ifndef _LIBCPP_HAS_NO_CONSTEXPR +#if TEST_STD_VER >= 11 { constexpr std::chrono::seconds s1(3); constexpr std::chrono::seconds s2(3); diff --git a/test/std/utilities/time/time.duration/time.duration.comparisons/op_less.pass.cpp b/test/std/utilities/time/time.duration/time.duration.comparisons/op_less.pass.cpp index 9d875579f3262..42e798254208e 100644 --- a/test/std/utilities/time/time.duration/time.duration.comparisons/op_less.pass.cpp +++ b/test/std/utilities/time/time.duration/time.duration.comparisons/op_less.pass.cpp @@ -34,6 +34,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { { @@ -92,7 +94,7 @@ int main() assert( (s1 <= s2)); assert( (s1 >= s2)); } -#ifndef _LIBCPP_HAS_NO_CONSTEXPR +#if TEST_STD_VER >= 11 { constexpr std::chrono::seconds s1(3); constexpr std::chrono::seconds s2(3); diff --git a/test/std/utilities/time/time.duration/time.duration.cons/convert_exact.pass.cpp b/test/std/utilities/time/time.duration/time.duration.cons/convert_exact.pass.cpp index 152227d82a823..c237fd7716f38 100644 --- a/test/std/utilities/time/time.duration/time.duration.cons/convert_exact.pass.cpp +++ b/test/std/utilities/time/time.duration/time.duration.cons/convert_exact.pass.cpp @@ -19,6 +19,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { { @@ -26,7 +28,7 @@ int main() std::chrono::microseconds us = ms; assert(us.count() == 1000); } -#ifndef _LIBCPP_HAS_NO_CONSTEXPR +#if TEST_STD_VER >= 11 { constexpr std::chrono::milliseconds ms(1); constexpr std::chrono::microseconds us = ms; diff --git a/test/std/utilities/time/time.duration/time.duration.cons/convert_inexact.pass.cpp b/test/std/utilities/time/time.duration/time.duration.cons/convert_inexact.pass.cpp index 519b2b141c298..4b5042df2ce2b 100644 --- a/test/std/utilities/time/time.duration/time.duration.cons/convert_inexact.pass.cpp +++ b/test/std/utilities/time/time.duration/time.duration.cons/convert_inexact.pass.cpp @@ -19,6 +19,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { { @@ -26,7 +28,7 @@ int main() std::chrono::duration<double, std::milli> ms = us; assert(ms.count() == 1./1000); } -#ifndef _LIBCPP_HAS_NO_CONSTEXPR +#if TEST_STD_VER >= 11 { constexpr std::chrono::duration<double, std::micro> us(1); constexpr std::chrono::duration<double, std::milli> ms = us; diff --git a/test/std/utilities/time/time.duration/time.duration.cons/convert_int_to_float.pass.cpp b/test/std/utilities/time/time.duration/time.duration.cons/convert_int_to_float.pass.cpp index 59fefe2e002d5..8e5938b9e4b30 100644 --- a/test/std/utilities/time/time.duration/time.duration.cons/convert_int_to_float.pass.cpp +++ b/test/std/utilities/time/time.duration/time.duration.cons/convert_int_to_float.pass.cpp @@ -19,6 +19,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { { @@ -26,7 +28,7 @@ int main() std::chrono::duration<double, std::milli> d = i; assert(d.count() == 3000); } -#ifndef _LIBCPP_HAS_NO_CONSTEXPR +#if TEST_STD_VER >= 11 { constexpr std::chrono::duration<int> i(3); constexpr std::chrono::duration<double, std::milli> d = i; diff --git a/test/std/utilities/time/time.duration/time.duration.cons/default.pass.cpp b/test/std/utilities/time/time.duration/time.duration.cons/default.pass.cpp index c52990961c259..4f7d67bb630cf 100644 --- a/test/std/utilities/time/time.duration/time.duration.cons/default.pass.cpp +++ b/test/std/utilities/time/time.duration/time.duration.cons/default.pass.cpp @@ -18,6 +18,7 @@ #include <chrono> #include <cassert> +#include "test_macros.h" #include "../../rep.h" template <class D> @@ -26,7 +27,7 @@ test() { D d; assert(d.count() == typename D::rep()); -#ifndef _LIBCPP_HAS_NO_CONSTEXPR +#if TEST_STD_VER >= 11 constexpr D d2 = D(); static_assert(d2.count() == typename D::rep(), ""); #endif diff --git a/test/std/utilities/time/time.duration/time.duration.cons/rep.pass.cpp b/test/std/utilities/time/time.duration/time.duration.cons/rep.pass.cpp index 20f81619bd125..6ad743e714c28 100644 --- a/test/std/utilities/time/time.duration/time.duration.cons/rep.pass.cpp +++ b/test/std/utilities/time/time.duration/time.duration.cons/rep.pass.cpp @@ -17,6 +17,7 @@ #include <chrono> #include <cassert> +#include "test_macros.h" #include "../../rep.h" template <class D, class R> @@ -25,7 +26,7 @@ test(R r) { D d(r); assert(d.count() == r); -#ifndef _LIBCPP_HAS_NO_CONSTEXPR +#if TEST_STD_VER >= 11 constexpr D d2(R(2)); static_assert(d2.count() == 2, ""); #endif diff --git a/test/std/utilities/time/time.duration/time.duration.cons/rep02.pass.cpp b/test/std/utilities/time/time.duration/time.duration.cons/rep02.pass.cpp index b3ba9f7081e45..ae745a76f4314 100644 --- a/test/std/utilities/time/time.duration/time.duration.cons/rep02.pass.cpp +++ b/test/std/utilities/time/time.duration/time.duration.cons/rep02.pass.cpp @@ -19,11 +19,13 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { std::chrono::duration<double> d(5); assert(d.count() == 5); -#ifndef _LIBCPP_HAS_NO_CONSTEXPR +#if TEST_STD_VER >= 11 constexpr std::chrono::duration<double> d2(5); static_assert(d2.count() == 5, ""); #endif diff --git a/test/std/utilities/time/time.duration/time.duration.nonmember/op_+.pass.cpp b/test/std/utilities/time/time.duration/time.duration.nonmember/op_+.pass.cpp index 6585351cb4c8e..6859ffcb208ab 100644 --- a/test/std/utilities/time/time.duration/time.duration.nonmember/op_+.pass.cpp +++ b/test/std/utilities/time/time.duration/time.duration.nonmember/op_+.pass.cpp @@ -18,6 +18,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { { @@ -44,7 +46,7 @@ int main() std::chrono::duration<double, std::ratio<1, 15> > r = s1 + s2; assert(r.count() == 75); } -#ifndef _LIBCPP_HAS_NO_CONSTEXPR +#if TEST_STD_VER >= 11 { constexpr std::chrono::seconds s1(3); constexpr std::chrono::seconds s2(5); diff --git a/test/std/utilities/time/time.duration/time.duration.nonmember/op_-.pass.cpp b/test/std/utilities/time/time.duration/time.duration.nonmember/op_-.pass.cpp index fac58b9716d3b..4bf26e4288b7e 100644 --- a/test/std/utilities/time/time.duration/time.duration.nonmember/op_-.pass.cpp +++ b/test/std/utilities/time/time.duration/time.duration.nonmember/op_-.pass.cpp @@ -19,6 +19,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { { @@ -45,7 +47,7 @@ int main() std::chrono::duration<double, std::ratio<1, 15> > r = s1 - s2; assert(r.count() == -15); } -#ifndef _LIBCPP_HAS_NO_CONSTEXPR +#if TEST_STD_VER >= 11 { constexpr std::chrono::seconds s1(3); constexpr std::chrono::seconds s2(5); diff --git a/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_duration.pass.cpp b/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_duration.pass.cpp index 6b24676f100cf..561516b665114 100644 --- a/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_duration.pass.cpp +++ b/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_duration.pass.cpp @@ -19,6 +19,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { { @@ -41,7 +43,7 @@ int main() std::chrono::duration<double, std::ratio<3, 5> > s2(5); assert(s1 / s2 == 20./3); } -#ifndef _LIBCPP_HAS_NO_CONSTEXPR +#if TEST_STD_VER >= 11 { constexpr std::chrono::nanoseconds ns1(15); constexpr std::chrono::nanoseconds ns2(5); diff --git a/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.pass.cpp b/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.pass.cpp index 3036cde5bf677..8b667e84d4d7d 100644 --- a/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.pass.cpp +++ b/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.pass.cpp @@ -19,6 +19,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { { @@ -26,7 +28,7 @@ int main() ns = ns / 5; assert(ns.count() == 3); } -#ifndef _LIBCPP_HAS_NO_CONSTEXPR +#if TEST_STD_VER >= 11 { constexpr std::chrono::nanoseconds ns(15); constexpr std::chrono::nanoseconds ns2 = ns / 5; diff --git a/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_duration.pass.cpp b/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_duration.pass.cpp index e69f3205d14ff..441b053dc521c 100644 --- a/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_duration.pass.cpp +++ b/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_duration.pass.cpp @@ -19,6 +19,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { { @@ -39,7 +41,7 @@ int main() std::chrono::duration<int, std::ratio<1, 15> > r = s1 % s2; assert(r.count() == 24); } -#ifndef _LIBCPP_HAS_NO_CONSTEXPR +#if TEST_STD_VER >= 11 { constexpr std::chrono::nanoseconds ns1(15); constexpr std::chrono::nanoseconds ns2(6); diff --git a/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.pass.cpp b/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.pass.cpp index 1acbe34ea5eb1..537fae373930f 100644 --- a/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.pass.cpp +++ b/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.pass.cpp @@ -19,6 +19,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { { @@ -26,7 +28,7 @@ int main() ns = ns % 6; assert(ns.count() == 3); } -#ifndef _LIBCPP_HAS_NO_CONSTEXPR +#if TEST_STD_VER >= 11 { constexpr std::chrono::nanoseconds ns(15); constexpr std::chrono::nanoseconds ns2 = ns % 6; diff --git a/test/std/utilities/time/time.duration/time.duration.nonmember/op_times_rep.pass.cpp b/test/std/utilities/time/time.duration/time.duration.nonmember/op_times_rep.pass.cpp index 190e74b1dc32a..6b8c837321273 100644 --- a/test/std/utilities/time/time.duration/time.duration.nonmember/op_times_rep.pass.cpp +++ b/test/std/utilities/time/time.duration/time.duration.nonmember/op_times_rep.pass.cpp @@ -24,6 +24,8 @@ #include <chrono> #include <cassert> +#include "test_macros.h" + int main() { { @@ -33,7 +35,7 @@ int main() ns = 6 * ns; assert(ns.count() == 90); } -#ifndef _LIBCPP_HAS_NO_CONSTEXPR +#if TEST_STD_VER >= 11 { constexpr std::chrono::nanoseconds ns(3); constexpr std::chrono::nanoseconds ns2 = ns * 5; diff --git a/test/std/utilities/time/time.duration/time.duration.special/max.pass.cpp b/test/std/utilities/time/time.duration/time.duration.special/max.pass.cpp index 405461e88ae9b..48c3e86e8101d 100644 --- a/test/std/utilities/time/time.duration/time.duration.special/max.pass.cpp +++ b/test/std/utilities/time/time.duration/time.duration.special/max.pass.cpp @@ -17,6 +17,7 @@ #include <limits> #include <cassert> +#include "test_macros.h" #include "../../rep.h" template <class D> @@ -27,7 +28,7 @@ void test() Rep max_rep = std::chrono::duration_values<Rep>::max(); assert(D::max().count() == max_rep); } -#ifndef _LIBCPP_HAS_NO_CONSTEXPR +#if TEST_STD_VER >= 11 { typedef typename D::rep Rep; constexpr Rep max_rep = std::chrono::duration_values<Rep>::max(); diff --git a/test/std/utilities/time/time.duration/time.duration.special/min.pass.cpp b/test/std/utilities/time/time.duration/time.duration.special/min.pass.cpp index 44cd64eff3d36..0d94aaa5869c0 100644 --- a/test/std/utilities/time/time.duration/time.duration.special/min.pass.cpp +++ b/test/std/utilities/time/time.duration/time.duration.special/min.pass.cpp @@ -17,6 +17,7 @@ #include <limits> #include <cassert> +#include "test_macros.h" #include "../../rep.h" template <class D> @@ -27,7 +28,7 @@ void test() Rep min_rep = std::chrono::duration_values<Rep>::min(); assert(D::min().count() == min_rep); } -#ifndef _LIBCPP_HAS_NO_CONSTEXPR +#if TEST_STD_VER >= 11 { typedef typename D::rep Rep; constexpr Rep min_rep = std::chrono::duration_values<Rep>::min(); diff --git a/test/std/utilities/time/time.duration/time.duration.special/zero.pass.cpp b/test/std/utilities/time/time.duration/time.duration.special/zero.pass.cpp index 18350fe2ff476..7b312c5acb50b 100644 --- a/test/std/utilities/time/time.duration/time.duration.special/zero.pass.cpp +++ b/test/std/utilities/time/time.duration/time.duration.special/zero.pass.cpp @@ -16,6 +16,7 @@ #include <chrono> #include <cassert> +#include "test_macros.h" #include "../../rep.h" template <class D> @@ -26,7 +27,7 @@ void test() Rep zero_rep = std::chrono::duration_values<Rep>::zero(); assert(D::zero().count() == zero_rep); } -#ifndef _LIBCPP_HAS_NO_CONSTEXPR +#if TEST_STD_VER >= 11 { typedef typename D::rep Rep; constexpr Rep zero_rep = std::chrono::duration_values<Rep>::zero(); |