diff options
| author | fdumont <fdumont@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-06-29 20:11:50 +0000 |
|---|---|---|
| committer | fdumont <fdumont@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-06-29 20:11:50 +0000 |
| commit | ad86ca1a49621e10f4ca3a0127a574d8b4d9feac (patch) | |
| tree | f5936d88794627a9de34beca288056058a9a9241 /libstdc++-v3/include/debug/multiset.h | |
| parent | 2aba8c96ff2c4ef49ec3ecc573b9e93b98b15e6e (diff) | |
2011-06-29 François Dumont <francois.cppdevs@free.fr>
* include/debug/set.h, unordered_map, multiset.h, forward_list,
unordered_set, vector, deque, string, list, multimap.h: Remove base
class default constructor calls.
* include/debug/map.h: Likewise and cleanup several redefinition of
base iterator typedef.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@175665 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/debug/multiset.h')
| -rw-r--r-- | libstdc++-v3/include/debug/multiset.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libstdc++-v3/include/debug/multiset.h b/libstdc++-v3/include/debug/multiset.h index ee4c04735dd..9f510000d4d 100644 --- a/libstdc++-v3/include/debug/multiset.h +++ b/libstdc++-v3/include/debug/multiset.h @@ -46,7 +46,6 @@ namespace __debug public __gnu_debug::_Safe_sequence<multiset<_Key, _Compare, _Allocator> > { typedef _GLIBCXX_STD_C::multiset<_Key, _Compare, _Allocator> _Base; - typedef __gnu_debug::_Safe_sequence<multiset> _Safe_base; typedef typename _Base::const_iterator _Base_const_iterator; typedef typename _Base::iterator _Base_iterator; @@ -88,21 +87,21 @@ namespace __debug __comp, __a) { } multiset(const multiset& __x) - : _Base(__x), _Safe_base() { } + : _Base(__x) { } multiset(const _Base& __x) - : _Base(__x), _Safe_base() { } + : _Base(__x) { } #ifdef __GXX_EXPERIMENTAL_CXX0X__ multiset(multiset&& __x) noexcept(is_nothrow_copy_constructible<_Compare>::value) - : _Base(std::move(__x)), _Safe_base() + : _Base(std::move(__x)) { this->_M_swap(__x); } multiset(initializer_list<value_type> __l, const _Compare& __comp = _Compare(), const allocator_type& __a = allocator_type()) - : _Base(__l, __comp, __a), _Safe_base() { } + : _Base(__l, __comp, __a) { } #endif ~multiset() _GLIBCXX_NOEXCEPT { } |