generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More N4258 changes. This time vector's constructors

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@238990 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2015-06-04 00:10:20 +00:00
parent 7b193f7797
commit 127db91f3e
5 changed files with 77 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/std/containers/sequences/vector/vector.cons/construct_default.pass.cpp
View File

@@ -9,7 +9,8 @@
// <vector>
// vector(const Alloc& = Alloc());
// vector();
// vector(const Alloc&);
#include <vector>
#include <cassert>
@@ -24,12 +25,17 @@ template <class C>
void
test0()
{
#if TEST_STD_VER > 14
static_assert((noexcept(C{})), "" );
#elif TEST_STD_VER >= 11
static_assert((noexcept(C()) == noexcept(typename C::allocator_type())), "" );
#endif
C c;
assert(c.__invariants());
assert(c.empty());
assert(c.get_allocator() == typename C::allocator_type());
assert(is_contiguous_container_asan_correct(c));
#if __cplusplus >= 201103L
#if TEST_STD_VER >= 11
C c1 = {};
assert(c1.__invariants());
assert(c1.empty());
@@ -42,6 +48,11 @@ template <class C>
void
test1(const typename C::allocator_type& a)
{
#if TEST_STD_VER > 14
static_assert((noexcept(C{typename C::allocator_type{}})), "" );
#elif TEST_STD_VER >= 11
static_assert((noexcept(C(typename C::allocator_type())) == std::is_nothrow_copy_constructible<typename C::allocator_type>::value), "" );
#endif
C c(a);
assert(c.__invariants());
assert(c.empty());
@@ -62,7 +73,7 @@ int main()
std::vector<int, stack_allocator<int, 10> > v;
assert(v.empty());
}
#if __cplusplus >= 201103L
#if TEST_STD_VER >= 11
{
test0<std::vector<int, min_allocator<int>> >();
test0<std::vector<NotConstructible, min_allocator<NotConstructible>> >();

11
test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
View File

@@ -17,6 +17,7 @@
#include <vector>
#include <cassert>
#include "test_macros.h"
#include "MoveOnly.h"
#include "test_allocator.h"
@@ -40,11 +41,21 @@ int main()
}
{
typedef std::vector<MoveOnly, other_allocator<MoveOnly>> C;
// See N4258 - vector<T, Allocator>::basic_string() noexcept;
#if TEST_STD_VER <= 14
static_assert(!std::is_nothrow_default_constructible<C>::value, "");
#else
static_assert( std::is_nothrow_default_constructible<C>::value, "");
#endif
}
{
typedef std::vector<MoveOnly, some_alloc<MoveOnly>> C;
// See N4258 - vector<T, Allocator>::basic_string() noexcept;
#if TEST_STD_VER <= 14
static_assert(!std::is_nothrow_default_constructible<C>::value, "");
#else
static_assert( std::is_nothrow_default_constructible<C>::value, "");
#endif
}
#endif
}