diff options
Diffstat (limited to 'test/std/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp')
-rw-r--r-- | test/std/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/std/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp b/test/std/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp index f40088ea3e86..b4482ddb2727 100644 --- a/test/std/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp +++ b/test/std/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp @@ -14,10 +14,11 @@ #include <vector> #include <cassert> +#include <cstddef> #include "test_macros.h" #include "test_iterators.h" -#include "../../../stack_allocator.h" +#include "test_allocator.h" #include "min_allocator.h" #include "asan_testing.h" @@ -27,7 +28,7 @@ test(Iterator first, Iterator last, const A& a) { C c(first, last, a); LIBCPP_ASSERT(c.__invariants()); - assert(c.size() == std::distance(first, last)); + assert(c.size() == static_cast<std::size_t>(std::distance(first, last))); LIBCPP_ASSERT(is_contiguous_container_asan_correct(c)); for (typename C::const_iterator i = c.cbegin(), e = c.cend(); i != e; ++i, ++first) assert(*i == *first); @@ -40,6 +41,9 @@ struct implicit_conv_allocator : min_allocator<T> { implicit_conv_allocator(void*) {} implicit_conv_allocator(const implicit_conv_allocator&) = default; + + template <class U> + implicit_conv_allocator(implicit_conv_allocator<U>) {} }; #endif |