diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-01-16 23:56:00 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-01-16 23:56:00 +0000 |
| commit | dbba6f8a2bcc4ddbbdc92d0a9344922806cda7b3 (patch) | |
| tree | 9dc2e2bab905cf6f9951684712378f6af4f9ff90 /libstdc++-v3/include/debug/unordered_map | |
| parent | cd8bd19dd67f48c105c9b04a5a71478c09290aab (diff) | |
| download | ppe42-gcc-dbba6f8a2bcc4ddbbdc92d0a9344922806cda7b3.tar.gz ppe42-gcc-dbba6f8a2bcc4ddbbdc92d0a9344922806cda7b3.zip | |
PR libstdc++/55043 (again)
* include/bits/alloc_traits.h (allocator_traits::construct): Disable
unless construction would be well-formed.
(__allow_copy_cons, __check_copy_constructible): Define.
* include/bits/unordered_map.h (__check_copy_constructible): Use as
base class so copy constructor will be deleted if appropriate.
(is_copy_constructible): Remove specialization.
* include/bits/unordered_set.h: Likewise.
* include/debug/unordered_map.h: Undo previous commit. Default copy
and move constructors.
* include/debug/unordered_set.h: Likewise.
* include/profile/unordered_map.h: Undo previous commit.
* include/profile/unordered_set.h: Likewise.
* testsuite/23_containers/unordered_map/55043.cc: Fix test.
* testsuite/23_containers/unordered_multimap/55043.cc: Likewise.
* testsuite/23_containers/unordered_multiset/55043.cc: Likewise.
* testsuite/23_containers/unordered_set/55043.cc: Likewise.
* testsuite/23_containers/unordered_map/requirements/53339.cc: XFAIL,
cannot support incomplete types.
* testsuite/23_containers/unordered_multimap/requirements/53339.cc:
Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@195253 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/debug/unordered_map')
| -rw-r--r-- | libstdc++-v3/include/debug/unordered_map | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/libstdc++-v3/include/debug/unordered_map b/libstdc++-v3/include/debug/unordered_map index 115abb58865..284450fc7d8 100644 --- a/libstdc++-v3/include/debug/unordered_map +++ b/libstdc++-v3/include/debug/unordered_map @@ -96,14 +96,12 @@ namespace __debug __gnu_debug::__base(__last), __n, __hf, __eql, __a) { } - unordered_map(const unordered_map& __x) - : _Base(__x) { } + unordered_map(const unordered_map& __x) = default; unordered_map(const _Base& __x) : _Base(__x) { } - unordered_map(unordered_map&& __x) - : _Base(std::move(__x)) { } + unordered_map(unordered_map&& __x) = default; unordered_map(initializer_list<value_type> __l, size_type __n = 0, @@ -547,14 +545,12 @@ namespace __debug __gnu_debug::__base(__last), __n, __hf, __eql, __a) { } - unordered_multimap(const unordered_multimap& __x) - : _Base(__x) { } + unordered_multimap(const unordered_multimap& __x) = default; unordered_multimap(const _Base& __x) : _Base(__x) { } - unordered_multimap(unordered_multimap&& __x) - : _Base(std::move(__x)) { } + unordered_multimap(unordered_multimap&& __x) = default; unordered_multimap(initializer_list<value_type> __l, size_type __n = 0, @@ -938,30 +934,6 @@ namespace __debug { return !(__x == __y); } } // namespace __debug - -_GLIBCXX_BEGIN_NAMESPACE_VERSION - - template<typename _Key, typename _Tp, typename _Hash, typename _Pred, - typename _Alloc> - struct - is_copy_constructible<__debug::unordered_map<_Key, _Tp, _Hash, _Pred, - _Alloc>> - : is_copy_constructible< _GLIBCXX_STD_C::unordered_map<_Key, _Tp, - _Hash, _Pred, - _Alloc> > - { }; - - template<typename _Key, typename _Tp, typename _Hash, typename _Pred, - typename _Alloc> - struct - is_copy_constructible<__debug::unordered_multimap<_Key, _Tp, _Hash, _Pred, - _Alloc>> - : is_copy_constructible< _GLIBCXX_STD_C::unordered_multimap<_Key, _Tp, - _Hash, _Pred, - _Alloc> > - { }; - -_GLIBCXX_END_NAMESPACE_VERSION } // namespace std #endif // C++11 |
