From f49217e52bfbe89d8f1faf604baf03a19c7d635d Mon Sep 17 00:00:00 2001 From: Antonio Sanchez Date: Fri, 17 Sep 2021 19:40:22 -0700 Subject: [PATCH] Fix implicit conversion warnings in tuple_test. Fixes #2329. --- test/tuple_test.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/tuple_test.cpp b/test/tuple_test.cpp index b40c457b2..8d8a5aacc 100644 --- a/test/tuple_test.cpp +++ b/test/tuple_test.cpp @@ -47,24 +47,24 @@ void basic_tuple_test() { VERIFY_IS_EQUAL(tuple_impl::get<2>(tuple3), 13.0); // tuple_impl::tuple_size. - VERIFY_IS_EQUAL(tuple_impl::tuple_size::value, 0); - VERIFY_IS_EQUAL(tuple_impl::tuple_size::value, 1); - VERIFY_IS_EQUAL(tuple_impl::tuple_size::value, 2); - VERIFY_IS_EQUAL(tuple_impl::tuple_size::value, 3); + VERIFY_IS_EQUAL(tuple_impl::tuple_size::value, size_t(0)); + VERIFY_IS_EQUAL(tuple_impl::tuple_size::value, size_t(1)); + VERIFY_IS_EQUAL(tuple_impl::tuple_size::value, size_t(2)); + VERIFY_IS_EQUAL(tuple_impl::tuple_size::value, size_t(3)); // tuple_impl::tuple_cat. auto tuple2cat3 = tuple_impl::tuple_cat(tuple2, tuple3); - VERIFY_IS_EQUAL(tuple_impl::tuple_size::value, 5); + VERIFY_IS_EQUAL(tuple_impl::tuple_size::value, size_t(5)); VERIFY_IS_EQUAL(tuple_impl::get<1>(tuple2cat3), 5.0f); VERIFY_IS_EQUAL(tuple_impl::get<3>(tuple2cat3), 11.0f); auto tuple3cat0 = tuple_impl::tuple_cat(tuple3, tuple0); - VERIFY_IS_EQUAL(tuple_impl::tuple_size::value, 3); + VERIFY_IS_EQUAL(tuple_impl::tuple_size::value, size_t(3)); auto singlecat = tuple_impl::tuple_cat(tuple3); - VERIFY_IS_EQUAL(tuple_impl::tuple_size::value, 3); + VERIFY_IS_EQUAL(tuple_impl::tuple_size::value, size_t(3)); auto emptycat = tuple_impl::tuple_cat(); - VERIFY_IS_EQUAL(tuple_impl::tuple_size::value, 0); + VERIFY_IS_EQUAL(tuple_impl::tuple_size::value, size_t(0)); auto tuple0cat1cat2cat3 = tuple_impl::tuple_cat(tuple0, tuple1, tuple2, tuple3); - VERIFY_IS_EQUAL(tuple_impl::tuple_size::value, 6); + VERIFY_IS_EQUAL(tuple_impl::tuple_size::value, size_t(6)); // make_tuple. // The tuple types should uses values for the second and fourth parameters. @@ -86,10 +86,10 @@ void basic_tuple_test() { decltype(tuple1)&, decltype(tuple2)&, decltype(tuple3)&> >::value) ); - VERIFY_IS_EQUAL( (tuple_impl::get<1>(tuple_impl::get<2>(tuple_tie))), 5.0 ); + VERIFY_IS_EQUAL( (tuple_impl::get<1>(tuple_impl::get<2>(tuple_tie))), 5.0f ); // Modify value and ensure tuple2 is updated. - tuple_impl::get<1>(tuple_impl::get<2>(tuple_tie)) = 10.0; - VERIFY_IS_EQUAL( (tuple_impl::get<1>(tuple2)), 10.0 ); + tuple_impl::get<1>(tuple_impl::get<2>(tuple_tie)) = 10.0f; + VERIFY_IS_EQUAL( (tuple_impl::get<1>(tuple2)), 10.0f ); // Assignment. int x = -1;