From b69a4ac042097ee840db4f1f58c4516f6d626ecd Mon Sep 17 00:00:00 2001 From: Michael Schellenberger Costa Date: Thu, 4 Jul 2024 13:29:57 +0200 Subject: [PATCH] Address review comments --- .../sequences/inplace_vector/assign.pass.cpp | 1 + .../sequences/inplace_vector/constructor.pass.cpp | 11 +++++++++++ .../sequences/inplace_vector/resize.pass.cpp | 1 + .../containers/sequences/inplace_vector/swap.pass.cpp | 1 + 4 files changed, 14 insertions(+) diff --git a/libcudacxx/test/libcudacxx/std/containers/sequences/inplace_vector/assign.pass.cpp b/libcudacxx/test/libcudacxx/std/containers/sequences/inplace_vector/assign.pass.cpp index 5506d62a68..ccf9089cab 100644 --- a/libcudacxx/test/libcudacxx/std/containers/sequences/inplace_vector/assign.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/containers/sequences/inplace_vector/assign.pass.cpp @@ -120,6 +120,7 @@ __host__ __device__ constexpr void test() assert(!size_value_grow.empty()); assert(cuda::std::equal(size_value_grow.begin(), size_value_grow.end(), expected.begin(), expected.end())); } + { using iter = cpp17_input_iterator; const cuda::std::array expected = {}; diff --git a/libcudacxx/test/libcudacxx/std/containers/sequences/inplace_vector/constructor.pass.cpp b/libcudacxx/test/libcudacxx/std/containers/sequences/inplace_vector/constructor.pass.cpp index 92530d0d5f..e06d96f6dc 100644 --- a/libcudacxx/test/libcudacxx/std/containers/sequences/inplace_vector/constructor.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/containers/sequences/inplace_vector/constructor.pass.cpp @@ -65,6 +65,7 @@ __host__ __device__ constexpr void test_copy_move() cuda::std::inplace_vector no_capacity_move(cuda::std::move(input)); assert(no_capacity_move.empty()); } + { cuda::std::inplace_vector input{}; cuda::std::inplace_vector with_capacity_empty_copy(input); @@ -73,6 +74,7 @@ __host__ __device__ constexpr void test_copy_move() cuda::std::inplace_vector with_capacity_empty_move(cuda::std::move(input)); assert(with_capacity_empty_move.empty()); } + { cuda::std::inplace_vector input{T(1), T(42), T(1337), T(0)}; cuda::std::inplace_vector with_capacity_copy(input); @@ -150,21 +152,25 @@ __host__ __device__ constexpr void test_iter() cuda::std::inplace_vector from_input_iter_no_capacity(iter{input}, iter{input}); assert(from_input_iter_no_capacity.empty()); } + { using iter = forward_iterator; cuda::std::inplace_vector from_forward_iter_no_capacity(iter{input}, iter{input}); assert(from_forward_iter_no_capacity.empty()); } + { using iter = cpp17_input_iterator; cuda::std::inplace_vector from_input_iter_empty(iter{input}, iter{input}); assert(from_input_iter_empty.empty()); } + { using iter = forward_iterator; cuda::std::inplace_vector from_forward_iter_empty(iter{input}, iter{input}); assert(from_forward_iter_empty.empty()); } + { using iter = cpp17_input_iterator; cuda::std::inplace_vector from_input_iter_non_empty(iter{input}, iter{input + 3}); @@ -172,6 +178,7 @@ __host__ __device__ constexpr void test_iter() assert(from_input_iter_non_empty.size() == 3); assert(cuda::std::equal(from_input_iter_non_empty.begin(), from_input_iter_non_empty.end(), input, input + 3)); } + { using iter = forward_iterator; cuda::std::inplace_vector from_forward_iter_non_empty(iter{input}, iter{input + 3}); @@ -189,11 +196,13 @@ __host__ __device__ constexpr void test_init_list() cuda::std::inplace_vector no_capacity(input); assert(no_capacity.empty()); } + { cuda::std::initializer_list input{}; cuda::std::inplace_vector from_empty(input); assert(from_empty.empty()); } + { cuda::std::initializer_list input{T(1), T(42), T(1337), T(0)}; cuda::std::inplace_vector from_non_empty(input); @@ -211,10 +220,12 @@ __host__ __device__ constexpr void test_range() cuda::std::inplace_vector no_capacity(Range{}); assert(no_capacity.empty()); } + { cuda::std::inplace_vector from_empty(Range{}); assert(from_empty.empty()); } + { const cuda::std::array expected{T(1), T(42), T(1337), T(0)}; cuda::std::inplace_vector from_non_empty(Range{T(1), T(42), T(1337), T(0)}); diff --git a/libcudacxx/test/libcudacxx/std/containers/sequences/inplace_vector/resize.pass.cpp b/libcudacxx/test/libcudacxx/std/containers/sequences/inplace_vector/resize.pass.cpp index f0ed2ed53c..72ed94029a 100644 --- a/libcudacxx/test/libcudacxx/std/containers/sequences/inplace_vector/resize.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/containers/sequences/inplace_vector/resize.pass.cpp @@ -118,6 +118,7 @@ __host__ __device__ constexpr void test() shrink_to_fit.shrink_to_fit(); assert(cuda::std::equal(shrink_to_fit.begin(), shrink_to_fit.end(), expected.begin(), expected.end())); } + { cuda::std::initializer_list expected{T(1), T(1337), T(1), T(12), T(0), T(-1)}; vec reserve{T(1), T(1337), T(1), T(12), T(0), T(-1)}; diff --git a/libcudacxx/test/libcudacxx/std/containers/sequences/inplace_vector/swap.pass.cpp b/libcudacxx/test/libcudacxx/std/containers/sequences/inplace_vector/swap.pass.cpp index 7df598ce5b..2596c94f08 100644 --- a/libcudacxx/test/libcudacxx/std/containers/sequences/inplace_vector/swap.pass.cpp +++ b/libcudacxx/test/libcudacxx/std/containers/sequences/inplace_vector/swap.pass.cpp @@ -44,6 +44,7 @@ __host__ __device__ constexpr void test() assert(cuda::std::equal(left.begin(), left.end(), expected_left.begin(), expected_left.end())); assert(cuda::std::equal(right.begin(), right.end(), expected_right.begin(), expected_right.end())); } + { using vec = cuda::std::inplace_vector; vec empty{};