diff options
| -rw-r--r-- | libcxx/include/__split_buffer | 4 | ||||
| -rw-r--r-- | libcxx/include/deque | 11 | ||||
| -rw-r--r-- | libcxx/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp | 50 | ||||
| -rw-r--r-- | libcxx/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp | 48 |
4 files changed, 109 insertions, 4 deletions
diff --git a/libcxx/include/__split_buffer b/libcxx/include/__split_buffer index e68b78508cc..7c22e484bf1 100644 --- a/libcxx/include/__split_buffer +++ b/libcxx/include/__split_buffer @@ -52,7 +52,8 @@ public: _LIBCPP_INLINE_VISIBILITY pointer& __end_cap() _NOEXCEPT {return __end_cap_.first();} _LIBCPP_INLINE_VISIBILITY const pointer& __end_cap() const _NOEXCEPT {return __end_cap_.first();} - __split_buffer(); + __split_buffer() + _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value); explicit __split_buffer(__alloc_rr& __a); explicit __split_buffer(const __alloc_rr& __a); __split_buffer(size_type __cap, size_type __start, __alloc_rr& __a); @@ -323,6 +324,7 @@ __split_buffer<_Tp, _Allocator>::__split_buffer(size_type __cap, size_type __sta template <class _Tp, class _Allocator> _LIBCPP_INLINE_VISIBILITY inline __split_buffer<_Tp, _Allocator>::__split_buffer() + _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value) : __first_(0), __begin_(0), __end_(0), __end_cap_(0) { } diff --git a/libcxx/include/deque b/libcxx/include/deque index a49205987ca..71fa7f845e1 100644 --- a/libcxx/include/deque +++ b/libcxx/include/deque @@ -38,7 +38,7 @@ public: typedef std::reverse_iterator<const_iterator> const_reverse_iterator; // construct/copy/destroy: - deque(); + deque() noexcept(is_nothrow_default_constructible<allocator_type>::value); explicit deque(const allocator_type& a); explicit deque(size_type n); deque(size_type n, const value_type& v); @@ -934,7 +934,8 @@ protected: _LIBCPP_INLINE_VISIBILITY const allocator_type& __alloc() const _NOEXCEPT {return __size_.second();} - __deque_base(); + __deque_base() + _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value); explicit __deque_base(const allocator_type& __a); public: ~__deque_base(); @@ -1072,6 +1073,7 @@ __deque_base<_Tp, _Allocator>::end() const _NOEXCEPT template <class _Tp, class _Allocator> inline _LIBCPP_INLINE_VISIBILITY __deque_base<_Tp, _Allocator>::__deque_base() + _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value) : __start_(0), __size_(0) {} template <class _Tp, class _Allocator> @@ -1185,7 +1187,10 @@ public: typedef _STD::reverse_iterator<const_iterator> const_reverse_iterator; // construct/copy/destroy: - _LIBCPP_INLINE_VISIBILITY deque() {} + _LIBCPP_INLINE_VISIBILITY + deque() + _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value) + {} _LIBCPP_INLINE_VISIBILITY deque(const allocator_type& __a) : __base(__a) {} explicit deque(size_type __n); deque(size_type __n, const value_type& __v); diff --git a/libcxx/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp new file mode 100644 index 00000000000..fef1bb01b01 --- /dev/null +++ b/libcxx/test/containers/sequences/deque/deque.cons/default_noexcept.pass.cpp @@ -0,0 +1,50 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// <deque> + +// deque() +// noexcept(is_nothrow_default_constructible<allocator_type>::value); + +// This tests a conforming extension + +#include <deque> +#include <cassert> + +#include "../../../MoveOnly.h" +#include "../../../test_allocator.h" + +template <class T> +struct some_alloc +{ + typedef T value_type; + some_alloc(const some_alloc&); +}; + +int main() +{ +#if __has_feature(cxx_noexcept) + { + typedef std::deque<MoveOnly> C; + static_assert(std::is_nothrow_default_constructible<C>::value, ""); + } + { + typedef std::deque<MoveOnly, test_allocator<MoveOnly>> C; + static_assert(std::is_nothrow_default_constructible<C>::value, ""); + } + { + typedef std::deque<MoveOnly, other_allocator<MoveOnly>> C; + static_assert(!std::is_nothrow_default_constructible<C>::value, ""); + } + { + typedef std::deque<MoveOnly, some_alloc<MoveOnly>> C; + static_assert(!std::is_nothrow_default_constructible<C>::value, ""); + } +#endif +} diff --git a/libcxx/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp b/libcxx/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp new file mode 100644 index 00000000000..491e906b0a8 --- /dev/null +++ b/libcxx/test/containers/sequences/deque/deque.cons/dtor_noexcept.pass.cpp @@ -0,0 +1,48 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// <deque> + +// ~deque() // implied noexcept; + +#include <deque> +#include <cassert> + +#include "../../../MoveOnly.h" +#include "../../../test_allocator.h" + +template <class T> +struct some_alloc +{ + typedef T value_type; + some_alloc(const some_alloc&); + ~some_alloc() noexcept(false); +}; + +int main() +{ +#if __has_feature(cxx_noexcept) + { + typedef std::deque<MoveOnly> C; + static_assert(std::is_nothrow_destructible<C>::value, ""); + } + { + typedef std::deque<MoveOnly, test_allocator<MoveOnly>> C; + static_assert(std::is_nothrow_destructible<C>::value, ""); + } + { + typedef std::deque<MoveOnly, other_allocator<MoveOnly>> C; + static_assert(std::is_nothrow_destructible<C>::value, ""); + } + { + typedef std::deque<MoveOnly, some_alloc<MoveOnly>> C; + static_assert(!std::is_nothrow_destructible<C>::value, ""); + } +#endif +} |
