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

Move bits from N4258. Mark vector's move-constructor unconditionally noexcept in C++1z

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@242148 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow 2015-07-14 14:46:32 +00:00
parent 7d914d1bff
commit 119ed47999
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/vector
View File

@ -553,7 +553,11 @@ public:
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
vector(vector&& __x) vector(vector&& __x)
#if _LIBCPP_STD_VER > 14
_NOEXCEPT;
#else
_NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value); _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value);
#endif
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
vector(vector&& __x, const allocator_type& __a); vector(vector&& __x, const allocator_type& __a);
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
@ -1220,7 +1224,11 @@ vector<_Tp, _Allocator>::vector(const vector& __x, const allocator_type& __a)
template <class _Tp, class _Allocator> template <class _Tp, class _Allocator>
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY
vector<_Tp, _Allocator>::vector(vector&& __x) vector<_Tp, _Allocator>::vector(vector&& __x)
#if _LIBCPP_STD_VER > 14
_NOEXCEPT
#else
_NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value) _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
#endif
: __base(_VSTD::move(__x.__alloc())) : __base(_VSTD::move(__x.__alloc()))
{ {
#if _LIBCPP_DEBUG_LEVEL >= 2 #if _LIBCPP_DEBUG_LEVEL >= 2
@ -2195,7 +2203,11 @@ public:
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
vector(vector&& __v) vector(vector&& __v)
#if _LIBCPP_STD_VER > 14
_NOEXCEPT;
#else
_NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value); _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value);
#endif
vector(vector&& __v, const allocator_type& __a); vector(vector&& __v, const allocator_type& __a);
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
vector& operator=(vector&& __v) vector& operator=(vector&& __v)
@ -2785,7 +2797,11 @@ vector<bool, _Allocator>::operator=(const vector& __v)
template <class _Allocator> template <class _Allocator>
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY
vector<bool, _Allocator>::vector(vector&& __v) vector<bool, _Allocator>::vector(vector&& __v)
#if _LIBCPP_STD_VER > 14
_NOEXCEPT
#else
_NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value) _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
#endif
: __begin_(__v.__begin_), : __begin_(__v.__begin_),
__size_(__v.__size_), __size_(__v.__size_),
__cap_alloc_(__v.__cap_alloc_) __cap_alloc_(__v.__cap_alloc_)

5
test/std/containers/sequences/vector.bool/move_noexcept.pass.cpp
View File

@ -43,7 +43,12 @@ int main()
} }
{ {
typedef std::vector<bool, some_alloc<bool>> C; typedef std::vector<bool, some_alloc<bool>> C;
// In C++17, move constructors for allocators are not allowed to throw
#if TEST_STD_VER > 14
static_assert( std::is_nothrow_move_constructible<C>::value, "");
#else
static_assert(!std::is_nothrow_move_constructible<C>::value, ""); static_assert(!std::is_nothrow_move_constructible<C>::value, "");
#endif
} }
#endif #endif
} }

5
test/std/containers/sequences/vector/vector.cons/move_noexcept.pass.cpp
View File

@ -44,7 +44,12 @@ int main()
} }
{ {
typedef std::vector<MoveOnly, some_alloc<MoveOnly>> C; typedef std::vector<MoveOnly, some_alloc<MoveOnly>> C;
// In C++17, move constructors for allocators are not allowed to throw
#if TEST_STD_VER > 14
static_assert( std::is_nothrow_move_constructible<C>::value, "");
#else
static_assert(!std::is_nothrow_move_constructible<C>::value, ""); static_assert(!std::is_nothrow_move_constructible<C>::value, "");
#endif
} }
#endif #endif
} }