diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2015-06-04 00:10:20 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2015-06-04 00:10:20 +0000 |
| commit | a8ae392718313e64e2d7bc092b00f51476c074b2 (patch) | |
| tree | 0445ced32b3cb10f51b5685485e1326c5f27bfad /libcxx/include/vector | |
| parent | c694b40590d24e92554c8abd9e3a6da8afec9d21 (diff) | |
| download | bcm5719-llvm-a8ae392718313e64e2d7bc092b00f51476c074b2.tar.gz bcm5719-llvm-a8ae392718313e64e2d7bc092b00f51476c074b2.zip | |
More N4258 changes. This time vector's constructors
llvm-svn: 238990
Diffstat (limited to 'libcxx/include/vector')
| -rw-r--r-- | libcxx/include/vector | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/libcxx/include/vector b/libcxx/include/vector index 48e970a2f40..ec413fa6e8e 100644 --- a/libcxx/include/vector +++ b/libcxx/include/vector @@ -501,13 +501,22 @@ public: _LIBCPP_INLINE_VISIBILITY vector() +#if _LIBCPP_STD_VER <= 14 _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value) +#else + _NOEXCEPT +#endif { #if _LIBCPP_DEBUG_LEVEL >= 2 __get_db()->__insert_c(this); #endif } _LIBCPP_INLINE_VISIBILITY explicit vector(const allocator_type& __a) +#if _LIBCPP_STD_VER <= 14 + _NOEXCEPT_(is_nothrow_copy_constructible<allocator_type>::value) +#else + _NOEXCEPT +#endif : __base(__a) { #if _LIBCPP_DEBUG_LEVEL >= 2 @@ -2162,8 +2171,18 @@ private: public: _LIBCPP_INLINE_VISIBILITY vector() +#if _LIBCPP_STD_VER <= 14 _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value); - _LIBCPP_INLINE_VISIBILITY explicit vector(const allocator_type& __a); +#else + _NOEXCEPT; +#endif + + _LIBCPP_INLINE_VISIBILITY explicit vector(const allocator_type& __a) +#if _LIBCPP_STD_VER <= 14 + _NOEXCEPT_(is_nothrow_copy_constructible<allocator_type>::value); +#else + _NOEXCEPT; +#endif ~vector(); explicit vector(size_type __n); #if _LIBCPP_STD_VER > 11 @@ -2550,7 +2569,11 @@ vector<bool, _Allocator>::__construct_at_end(_ForwardIterator __first, _ForwardI template <class _Allocator> inline _LIBCPP_INLINE_VISIBILITY vector<bool, _Allocator>::vector() +#if _LIBCPP_STD_VER <= 14 _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value) +#else + _NOEXCEPT +#endif : __begin_(nullptr), __size_(0), __cap_alloc_(0) @@ -2560,6 +2583,11 @@ vector<bool, _Allocator>::vector() template <class _Allocator> inline _LIBCPP_INLINE_VISIBILITY vector<bool, _Allocator>::vector(const allocator_type& __a) +#if _LIBCPP_STD_VER <= 14 + _NOEXCEPT_(is_nothrow_copy_constructible<allocator_type>::value) +#else + _NOEXCEPT +#endif : __begin_(nullptr), __size_(0), __cap_alloc_(0, static_cast<__storage_allocator>(__a)) |
