diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2016-12-08 13:25:03 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2016-12-08 13:25:03 +0000 |
| commit | 1d752b4feec13afaae5ad9f6d24c0f4d83d674e1 (patch) | |
| tree | be71cbbb3d66fb3ba7a56976042e5f6d51a82a6d /libstdc++-v3/include/std | |
| parent | eae0b895e0f4dce0601e27cc7c54c89be3c480b9 (diff) | |
| download | gcc-1d752b4feec13afaae5ad9f6d24c0f4d83d674e1.zip gcc-1d752b4feec13afaae5ad9f6d24c0f4d83d674e1.tar.gz gcc-1d752b4feec13afaae5ad9f6d24c0f4d83d674e1.tar.bz2 | |
Delete std::swap for debug mode array
* include/debug/array (swap): Add deleted overload.
* include/bits/stl_pair.h (swap): Remove redundant inline keyword
from deleted overload.
* include/bits/unique_ptr.h (swap): Likewise.
* include/std/array (swap): Likewise.
* include/std/optional (swap): Likewise.
* include/std/tuple (swap): Likewise.
* include/std/variant (swap): Likewise.
* testsuite/23_containers/array/tuple_interface/get_debug_neg.cc:
Adjust dg-error line numbers.
* testsuite/23_containers/array/tuple_interface/get_neg.cc: Likewise.
* testsuite/23_containers/array/tuple_interface/
tuple_element_debug_neg.cc: Likewise.
* testsuite/23_containers/array/tuple_interface/tuple_element_neg.cc:
Likewise.
From-SVN: r243437
Diffstat (limited to 'libstdc++-v3/include/std')
| -rw-r--r-- | libstdc++-v3/include/std/array | 1 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/optional | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/tuple | 1 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/variant | 4 |
4 files changed, 3 insertions, 5 deletions
diff --git a/libstdc++-v3/include/std/array b/libstdc++-v3/include/std/array index fa7bac6..f5028c9 100644 --- a/libstdc++-v3/include/std/array +++ b/libstdc++-v3/include/std/array @@ -290,7 +290,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER #if __cplusplus > 201402L || !defined(__STRICT_ANSI__) // c++1z or gnu++11 template<typename _Tp, std::size_t _Nm> - inline typename enable_if< !_GLIBCXX_STD_C::__array_traits<_Tp, _Nm>::_Is_swappable::value>::type swap(array<_Tp, _Nm>&, array<_Tp, _Nm>&) = delete; diff --git a/libstdc++-v3/include/std/optional b/libstdc++-v3/include/std/optional index 191d64b..3d69e10 100644 --- a/libstdc++-v3/include/std/optional +++ b/libstdc++-v3/include/std/optional @@ -930,7 +930,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { __lhs.swap(__rhs); } template<typename _Tp> - inline enable_if_t<!(is_move_constructible_v<_Tp> && is_swappable_v<_Tp>)> + enable_if_t<!(is_move_constructible_v<_Tp> && is_swappable_v<_Tp>)> swap(optional<_Tp>&, optional<_Tp>&) = delete; template<typename _Tp> diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple index fb2fd17..13e0bf8 100644 --- a/libstdc++-v3/include/std/tuple +++ b/libstdc++-v3/include/std/tuple @@ -1588,7 +1588,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #if __cplusplus > 201402L || !defined(__STRICT_ANSI__) // c++1z or gnu++11 template<typename... _Elements> - inline typename enable_if<!__and_<__is_swappable<_Elements>...>::value>::type swap(tuple<_Elements...>&, tuple<_Elements...>&) = delete; #endif diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index dd6109d..822674f 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -865,8 +865,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { __lhs.swap(__rhs); } template<typename... _Types> - inline enable_if_t<!__and_<is_move_constructible<_Types>..., - is_swappable<_Types>...>::value> + enable_if_t<!__and_<is_move_constructible<_Types>..., + is_swappable<_Types>...>::value> swap(variant<_Types...>&, variant<_Types...>&) = delete; class bad_variant_access : public exception |