2009-10-03 04:17:41 +02:00
|
|
|
// Profiling unordered_set/unordered_multiset implementation -*- C++ -*-
|
|
|
|
|
2011-05-26 17:35:02 +02:00
|
|
|
// Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
|
2009-10-03 04:17:41 +02:00
|
|
|
//
|
|
|
|
// This file is part of the GNU ISO C++ Library. This library is free
|
|
|
|
// software; you can redistribute it and/or modify it under the
|
|
|
|
// terms of the GNU General Public License as published by the
|
|
|
|
// Free Software Foundation; either version 2, or (at your option)
|
|
|
|
// any later version.
|
|
|
|
|
|
|
|
// This library is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU General Public License for more details.
|
|
|
|
|
|
|
|
// You should have received a copy of the GNU General Public License along
|
|
|
|
// with this library; see the file COPYING. If not, write to the Free
|
|
|
|
// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
|
|
|
// USA.
|
|
|
|
|
|
|
|
// As a special exception, you may use this file as part of a free software
|
|
|
|
// library without restriction. Specifically, if other files instantiate
|
|
|
|
// templates or use macros or inline functions from this file, or you compile
|
|
|
|
// this file and link it with other files to produce an executable, this
|
|
|
|
// file does not by itself cause the resulting executable to be covered by
|
|
|
|
// the GNU General Public License. This exception does not however
|
|
|
|
// invalidate any other reasons why the executable file might be covered by
|
|
|
|
// the GNU General Public License.
|
|
|
|
|
|
|
|
/** @file profile/unordered_set
|
|
|
|
* This file is a GNU profile extension to the Standard C++ Library.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _GLIBCXX_PROFILE_UNORDERED_SET
|
|
|
|
#define _GLIBCXX_PROFILE_UNORDERED_SET 1
|
|
|
|
|
2010-03-30 12:59:17 +02:00
|
|
|
#ifndef __GXX_EXPERIMENTAL_CXX0X__
|
2010-02-10 20:14:33 +01:00
|
|
|
# include <bits/c++0x_warning.h>
|
2010-03-30 12:59:17 +02:00
|
|
|
#else
|
|
|
|
# include <unordered_set>
|
2009-10-03 04:17:41 +02:00
|
|
|
|
2010-03-30 12:59:17 +02:00
|
|
|
#include <profile/base.h>
|
2009-10-03 04:17:41 +02:00
|
|
|
|
|
|
|
#define _GLIBCXX_BASE unordered_set<_Key, _Hash, _Pred, _Alloc>
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-30 23:39:36 +01:00
|
|
|
#define _GLIBCXX_STD_BASE _GLIBCXX_STD_C::_GLIBCXX_BASE
|
2009-10-03 04:17:41 +02:00
|
|
|
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-30 23:39:36 +01:00
|
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
|
|
|
namespace __profile
|
|
|
|
{
|
|
|
|
/** @brief Unordered_set wrapper with performance instrumentation. */
|
|
|
|
template<typename _Key,
|
|
|
|
typename _Hash = std::hash<_Key>,
|
|
|
|
typename _Pred = std::equal_to<_Key>,
|
|
|
|
typename _Alloc = std::allocator<_Key> >
|
|
|
|
class unordered_set
|
|
|
|
: public _GLIBCXX_STD_BASE
|
|
|
|
{
|
|
|
|
typedef typename _GLIBCXX_STD_BASE _Base;
|
|
|
|
|
|
|
|
public:
|
|
|
|
typedef typename _Base::size_type size_type;
|
|
|
|
typedef typename _Base::hasher hasher;
|
|
|
|
typedef typename _Base::key_equal key_equal;
|
|
|
|
typedef typename _Base::allocator_type allocator_type;
|
|
|
|
typedef typename _Base::key_type key_type;
|
|
|
|
typedef typename _Base::value_type value_type;
|
|
|
|
typedef typename _Base::difference_type difference_type;
|
|
|
|
typedef typename _Base::reference reference;
|
|
|
|
typedef typename _Base::const_reference const_reference;
|
|
|
|
|
|
|
|
typedef typename _Base::iterator iterator;
|
|
|
|
typedef typename _Base::const_iterator const_iterator;
|
|
|
|
|
|
|
|
explicit
|
|
|
|
unordered_set(size_type __n = 10,
|
|
|
|
const hasher& __hf = hasher(),
|
|
|
|
const key_equal& __eql = key_equal(),
|
|
|
|
const allocator_type& __a = allocator_type())
|
|
|
|
: _Base(__n, __hf, __eql, __a)
|
|
|
|
{
|
|
|
|
__profcxx_hashtable_construct(this, _Base::bucket_count());
|
|
|
|
__profcxx_hashtable_construct2(this);
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _InputIterator>
|
|
|
|
unordered_set(_InputIterator __f, _InputIterator __l,
|
hashtable.h (_Hashtable<>::operator=(const _Hashtable&)): Move inline.
2010-08-13 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/hashtable.h (_Hashtable<>::operator=(const
_Hashtable&)): Move inline.
(operator=(_Hashtable&&)): Define.
* include/bits/unordered_map.h (unordered_map(unordered_map&&),
unordered_map(const unordered_map&), unordered_multimap
(unordered_multimap&&), unordered_multimap(const unordered_multimap&),
__unordered_map(__unordered_map&&), __unordered_map(const
__unordered_map&), __unordered_multimap(__unordered_multimap&&),
__unordered_multimap(const __unordered_multimap&)): Do not define,
leave implicit.
* include/bits/unordered_set.h (unordered_set(unordered_set&&),
unordered_set(const unordered_set&), unordered_multiset
(unordered_multiset&&), unordered_multiset(const unordered_multiset&),
__unordered_set(__unordered_set&&), __unordered_set(const
__unordered_set&), __unordered_multiset(__unordered_multiset&&),
__unordered_multiset(const __unordered_multiset&)): Likewise.
* include/bits/unordered_map.h (__unordered_map(initializer_list<>),
__unordered_map<>::operator=(initializer_list<>),
__unordered_multimap(initializer_list<>), __unordered_multimap<>::
operator=(initializer_list<>)): Add.
* include/bits/unordered_set.h (__unordered_set(initializer_list<>),
__unordered_set<>::operator=(initializer_list<>),
__unordered_multiset(initializer_list<>), __unordered_multiset<>::
operator=(initializer_list<>)): Likewise.
* include/bits/unordered_map.h (__unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Fix __n default to 0.
* include/bits/unordered_set.h (__unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
* include/debug/unordered_map (unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_map(_InputIterator, _InputIterator,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Likewise.
* include/debug/unordered_set (unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_set(_InputIterator, _InputIterator,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
* include/profile/unordered_map (unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_map(_InputIterator, _InputIterator,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Likewise.
* include/profile/unordered_set (unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_set(_InputIterator, _InputIterator,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
From-SVN: r163236
2010-08-14 03:00:23 +02:00
|
|
|
size_type __n = 0,
|
|
|
|
const hasher& __hf = hasher(),
|
|
|
|
const key_equal& __eql = key_equal(),
|
|
|
|
const allocator_type& __a = allocator_type())
|
2009-10-03 04:17:41 +02:00
|
|
|
: _Base(__f, __l, __n, __hf, __eql, __a)
|
|
|
|
{
|
|
|
|
__profcxx_hashtable_construct(this, _Base::bucket_count());
|
|
|
|
__profcxx_hashtable_construct2(this);
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_set(const _Base& __x)
|
|
|
|
: _Base(__x)
|
|
|
|
{
|
|
|
|
__profcxx_hashtable_construct(this, _Base::bucket_count());
|
|
|
|
__profcxx_hashtable_construct2(this);
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_set(unordered_set&& __x)
|
2010-08-05 09:34:08 +02:00
|
|
|
: _Base(std::move(__x))
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
|
|
|
__profcxx_hashtable_construct(this, _Base::bucket_count());
|
|
|
|
__profcxx_hashtable_construct2(this);
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_set(initializer_list<value_type> __l,
|
hashtable.h (_Hashtable<>::operator=(const _Hashtable&)): Move inline.
2010-08-13 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/hashtable.h (_Hashtable<>::operator=(const
_Hashtable&)): Move inline.
(operator=(_Hashtable&&)): Define.
* include/bits/unordered_map.h (unordered_map(unordered_map&&),
unordered_map(const unordered_map&), unordered_multimap
(unordered_multimap&&), unordered_multimap(const unordered_multimap&),
__unordered_map(__unordered_map&&), __unordered_map(const
__unordered_map&), __unordered_multimap(__unordered_multimap&&),
__unordered_multimap(const __unordered_multimap&)): Do not define,
leave implicit.
* include/bits/unordered_set.h (unordered_set(unordered_set&&),
unordered_set(const unordered_set&), unordered_multiset
(unordered_multiset&&), unordered_multiset(const unordered_multiset&),
__unordered_set(__unordered_set&&), __unordered_set(const
__unordered_set&), __unordered_multiset(__unordered_multiset&&),
__unordered_multiset(const __unordered_multiset&)): Likewise.
* include/bits/unordered_map.h (__unordered_map(initializer_list<>),
__unordered_map<>::operator=(initializer_list<>),
__unordered_multimap(initializer_list<>), __unordered_multimap<>::
operator=(initializer_list<>)): Add.
* include/bits/unordered_set.h (__unordered_set(initializer_list<>),
__unordered_set<>::operator=(initializer_list<>),
__unordered_multiset(initializer_list<>), __unordered_multiset<>::
operator=(initializer_list<>)): Likewise.
* include/bits/unordered_map.h (__unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Fix __n default to 0.
* include/bits/unordered_set.h (__unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
* include/debug/unordered_map (unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_map(_InputIterator, _InputIterator,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Likewise.
* include/debug/unordered_set (unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_set(_InputIterator, _InputIterator,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
* include/profile/unordered_map (unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_map(_InputIterator, _InputIterator,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Likewise.
* include/profile/unordered_set (unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_set(_InputIterator, _InputIterator,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
From-SVN: r163236
2010-08-14 03:00:23 +02:00
|
|
|
size_type __n = 0,
|
2009-10-03 04:17:41 +02:00
|
|
|
const hasher& __hf = hasher(),
|
|
|
|
const key_equal& __eql = key_equal(),
|
|
|
|
const allocator_type& __a = allocator_type())
|
|
|
|
: _Base(__l, __n, __hf, __eql, __a) { }
|
|
|
|
|
|
|
|
unordered_set&
|
|
|
|
operator=(const unordered_set& __x)
|
|
|
|
{
|
|
|
|
*static_cast<_Base*>(this) = __x;
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_set&
|
|
|
|
operator=(unordered_set&& __x)
|
|
|
|
{
|
2010-01-09 12:16:42 +01:00
|
|
|
// NB: DR 1204.
|
|
|
|
// NB: DR 675.
|
|
|
|
this->clear();
|
|
|
|
this->swap(__x);
|
2009-10-03 04:17:41 +02:00
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_set&
|
|
|
|
operator=(initializer_list<value_type> __l)
|
|
|
|
{
|
|
|
|
this->clear();
|
|
|
|
this->insert(__l);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
2011-06-01 16:16:19 +02:00
|
|
|
~unordered_set() noexcept
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
|
|
|
__profcxx_hashtable_destruct(this, _Base::bucket_count(),
|
|
|
|
_Base::size());
|
|
|
|
_M_profile_destruct();
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
swap(unordered_set& __x)
|
|
|
|
{
|
|
|
|
_Base::swap(__x);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2011-05-26 17:35:02 +02:00
|
|
|
clear() noexcept
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
|
|
|
__profcxx_hashtable_destruct(this, _Base::bucket_count(),
|
|
|
|
_Base::size());
|
|
|
|
_M_profile_destruct();
|
|
|
|
_Base::clear();
|
|
|
|
}
|
2010-01-03 15:50:09 +01:00
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
void
|
|
|
|
insert(std::initializer_list<value_type> __l)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
|
|
|
_Base::insert(__l);
|
|
|
|
_M_profile_resize(__old_size, _Base::bucket_count());
|
|
|
|
}
|
2010-01-03 15:50:09 +01:00
|
|
|
|
|
|
|
std::pair<iterator, bool>
|
|
|
|
insert(const value_type& __obj)
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
2010-10-28 18:01:05 +02:00
|
|
|
size_type __old_size = _Base::bucket_count();
|
2010-01-03 15:50:09 +01:00
|
|
|
std::pair<iterator, bool> __res = _Base::insert(__obj);
|
2009-10-03 04:17:41 +02:00
|
|
|
_M_profile_resize(__old_size, _Base::bucket_count());
|
|
|
|
return __res;
|
|
|
|
}
|
2010-01-03 15:50:09 +01:00
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
iterator
|
|
|
|
insert(const_iterator __iter, const value_type& __v)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
2010-02-10 17:09:42 +01:00
|
|
|
iterator __res = _Base::insert(__iter, __v);
|
|
|
|
_M_profile_resize(__old_size, _Base::bucket_count());
|
|
|
|
return __res;
|
2009-10-03 04:17:41 +02:00
|
|
|
}
|
|
|
|
|
2010-10-28 18:01:05 +02:00
|
|
|
std::pair<iterator, bool>
|
|
|
|
insert(value_type&& __obj)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
|
|
|
std::pair<iterator, bool> __res = _Base::insert(std::move(__obj));
|
|
|
|
_M_profile_resize(__old_size, _Base::bucket_count());
|
|
|
|
return __res;
|
|
|
|
}
|
|
|
|
|
|
|
|
iterator
|
|
|
|
insert(const_iterator __iter, value_type&& __v)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
|
|
|
iterator __res = _Base::insert(__iter, std::move(__v));
|
|
|
|
_M_profile_resize(__old_size, _Base::bucket_count());
|
|
|
|
return __res;
|
|
|
|
}
|
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
template<typename _InputIter>
|
2010-02-10 17:09:42 +01:00
|
|
|
void
|
|
|
|
insert(_InputIter __first, _InputIter __last)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
|
|
|
_Base::insert(__first, __last);
|
|
|
|
_M_profile_resize(__old_size, _Base::bucket_count());
|
|
|
|
}
|
2009-10-03 04:17:41 +02:00
|
|
|
|
|
|
|
void
|
|
|
|
insert(const value_type* __first, const value_type* __last)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
|
|
|
_Base::insert(__first, __last);
|
|
|
|
_M_profile_resize(__old_size, _Base::bucket_count());
|
|
|
|
}
|
|
|
|
|
|
|
|
void rehash(size_type __n)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
|
|
|
_Base::rehash(__n);
|
|
|
|
_M_profile_resize(__old_size, _Base::bucket_count());
|
|
|
|
}
|
2010-01-03 15:50:09 +01:00
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
private:
|
|
|
|
_Base&
|
2011-05-26 17:35:02 +02:00
|
|
|
_M_base() noexcept { return *this; }
|
2009-10-03 04:17:41 +02:00
|
|
|
|
|
|
|
const _Base&
|
2011-05-26 17:35:02 +02:00
|
|
|
_M_base() const noexcept { return *this; }
|
2009-10-03 04:17:41 +02:00
|
|
|
|
2010-02-10 17:09:42 +01:00
|
|
|
void
|
|
|
|
_M_profile_resize(size_type __old_size, size_type __new_size)
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
|
|
|
if (__old_size != __new_size)
|
2010-02-10 17:09:42 +01:00
|
|
|
__profcxx_hashtable_resize(this, __old_size, __new_size);
|
2009-10-03 04:17:41 +02:00
|
|
|
}
|
2010-02-10 17:09:42 +01:00
|
|
|
|
|
|
|
void
|
|
|
|
_M_profile_destruct()
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
|
|
|
size_type __hops = 0, __lc = 0, __chain = 0;
|
2010-02-10 17:09:42 +01:00
|
|
|
for (iterator __it = _M_base().begin(); __it != _M_base().end();
|
|
|
|
++__it)
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
2010-02-10 17:09:42 +01:00
|
|
|
while (__it._M_cur_node->_M_next)
|
|
|
|
{
|
|
|
|
++__chain;
|
|
|
|
++__it;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (__chain)
|
|
|
|
{
|
|
|
|
++__chain;
|
|
|
|
__lc = __lc > __chain ? __lc : __chain;
|
|
|
|
__hops += __chain * (__chain - 1) / 2;
|
|
|
|
__chain = 0;
|
|
|
|
}
|
2009-10-03 04:17:41 +02:00
|
|
|
}
|
|
|
|
__profcxx_hashtable_destruct2(this, __lc, _Base::size(), __hops);
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
2010-02-10 17:09:42 +01:00
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
|
|
|
|
inline void
|
|
|
|
swap(unordered_set<_Value, _Hash, _Pred, _Alloc>& __x,
|
2010-02-10 17:09:42 +01:00
|
|
|
unordered_set<_Value, _Hash, _Pred, _Alloc>& __y)
|
2009-10-03 04:17:41 +02:00
|
|
|
{ __x.swap(__y); }
|
|
|
|
|
2010-03-26 03:19:10 +01:00
|
|
|
template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
|
|
|
|
inline bool
|
|
|
|
operator==(const unordered_set<_Value, _Hash, _Pred, _Alloc>& __x,
|
|
|
|
const unordered_set<_Value, _Hash, _Pred, _Alloc>& __y)
|
|
|
|
{ return __x._M_equal(__y); }
|
|
|
|
|
|
|
|
template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
|
|
|
|
inline bool
|
|
|
|
operator!=(const unordered_set<_Value, _Hash, _Pred, _Alloc>& __x,
|
|
|
|
const unordered_set<_Value, _Hash, _Pred, _Alloc>& __y)
|
|
|
|
{ return !(__x == __y); }
|
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
#undef _GLIBCXX_BASE
|
|
|
|
#undef _GLIBCXX_STD_BASE
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-30 23:39:36 +01:00
|
|
|
#define _GLIBCXX_STD_BASE _GLIBCXX_STD_C::_GLIBCXX_BASE
|
2009-10-03 04:17:41 +02:00
|
|
|
#define _GLIBCXX_BASE unordered_multiset<_Value, _Hash, _Pred, _Alloc>
|
|
|
|
|
|
|
|
/** @brief Unordered_multiset wrapper with performance instrumentation. */
|
|
|
|
template<typename _Value,
|
|
|
|
typename _Hash = std::hash<_Value>,
|
|
|
|
typename _Pred = std::equal_to<_Value>,
|
|
|
|
typename _Alloc = std::allocator<_Value> >
|
|
|
|
class unordered_multiset
|
|
|
|
: public _GLIBCXX_STD_BASE
|
|
|
|
{
|
|
|
|
typedef typename _GLIBCXX_STD_BASE _Base;
|
|
|
|
|
|
|
|
public:
|
|
|
|
typedef typename _Base::size_type size_type;
|
|
|
|
typedef typename _Base::hasher hasher;
|
|
|
|
typedef typename _Base::key_equal key_equal;
|
|
|
|
typedef typename _Base::allocator_type allocator_type;
|
|
|
|
typedef typename _Base::key_type key_type;
|
|
|
|
typedef typename _Base::value_type value_type;
|
|
|
|
typedef typename _Base::difference_type difference_type;
|
|
|
|
typedef typename _Base::reference reference;
|
|
|
|
typedef typename _Base::const_reference const_reference;
|
|
|
|
|
|
|
|
typedef typename _Base::iterator iterator;
|
|
|
|
typedef typename _Base::const_iterator const_iterator;
|
|
|
|
|
|
|
|
explicit
|
|
|
|
unordered_multiset(size_type __n = 10,
|
hashtable.h (_Hashtable<>::operator=(const _Hashtable&)): Move inline.
2010-08-13 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/hashtable.h (_Hashtable<>::operator=(const
_Hashtable&)): Move inline.
(operator=(_Hashtable&&)): Define.
* include/bits/unordered_map.h (unordered_map(unordered_map&&),
unordered_map(const unordered_map&), unordered_multimap
(unordered_multimap&&), unordered_multimap(const unordered_multimap&),
__unordered_map(__unordered_map&&), __unordered_map(const
__unordered_map&), __unordered_multimap(__unordered_multimap&&),
__unordered_multimap(const __unordered_multimap&)): Do not define,
leave implicit.
* include/bits/unordered_set.h (unordered_set(unordered_set&&),
unordered_set(const unordered_set&), unordered_multiset
(unordered_multiset&&), unordered_multiset(const unordered_multiset&),
__unordered_set(__unordered_set&&), __unordered_set(const
__unordered_set&), __unordered_multiset(__unordered_multiset&&),
__unordered_multiset(const __unordered_multiset&)): Likewise.
* include/bits/unordered_map.h (__unordered_map(initializer_list<>),
__unordered_map<>::operator=(initializer_list<>),
__unordered_multimap(initializer_list<>), __unordered_multimap<>::
operator=(initializer_list<>)): Add.
* include/bits/unordered_set.h (__unordered_set(initializer_list<>),
__unordered_set<>::operator=(initializer_list<>),
__unordered_multiset(initializer_list<>), __unordered_multiset<>::
operator=(initializer_list<>)): Likewise.
* include/bits/unordered_map.h (__unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Fix __n default to 0.
* include/bits/unordered_set.h (__unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
* include/debug/unordered_map (unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_map(_InputIterator, _InputIterator,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Likewise.
* include/debug/unordered_set (unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_set(_InputIterator, _InputIterator,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
* include/profile/unordered_map (unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_map(_InputIterator, _InputIterator,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Likewise.
* include/profile/unordered_set (unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_set(_InputIterator, _InputIterator,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
From-SVN: r163236
2010-08-14 03:00:23 +02:00
|
|
|
const hasher& __hf = hasher(),
|
|
|
|
const key_equal& __eql = key_equal(),
|
|
|
|
const allocator_type& __a = allocator_type())
|
2009-10-03 04:17:41 +02:00
|
|
|
: _Base(__n, __hf, __eql, __a)
|
|
|
|
{
|
|
|
|
__profcxx_hashtable_construct(this, _Base::bucket_count());
|
|
|
|
}
|
|
|
|
|
|
|
|
template<typename _InputIterator>
|
|
|
|
unordered_multiset(_InputIterator __f, _InputIterator __l,
|
hashtable.h (_Hashtable<>::operator=(const _Hashtable&)): Move inline.
2010-08-13 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/hashtable.h (_Hashtable<>::operator=(const
_Hashtable&)): Move inline.
(operator=(_Hashtable&&)): Define.
* include/bits/unordered_map.h (unordered_map(unordered_map&&),
unordered_map(const unordered_map&), unordered_multimap
(unordered_multimap&&), unordered_multimap(const unordered_multimap&),
__unordered_map(__unordered_map&&), __unordered_map(const
__unordered_map&), __unordered_multimap(__unordered_multimap&&),
__unordered_multimap(const __unordered_multimap&)): Do not define,
leave implicit.
* include/bits/unordered_set.h (unordered_set(unordered_set&&),
unordered_set(const unordered_set&), unordered_multiset
(unordered_multiset&&), unordered_multiset(const unordered_multiset&),
__unordered_set(__unordered_set&&), __unordered_set(const
__unordered_set&), __unordered_multiset(__unordered_multiset&&),
__unordered_multiset(const __unordered_multiset&)): Likewise.
* include/bits/unordered_map.h (__unordered_map(initializer_list<>),
__unordered_map<>::operator=(initializer_list<>),
__unordered_multimap(initializer_list<>), __unordered_multimap<>::
operator=(initializer_list<>)): Add.
* include/bits/unordered_set.h (__unordered_set(initializer_list<>),
__unordered_set<>::operator=(initializer_list<>),
__unordered_multiset(initializer_list<>), __unordered_multiset<>::
operator=(initializer_list<>)): Likewise.
* include/bits/unordered_map.h (__unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Fix __n default to 0.
* include/bits/unordered_set.h (__unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
* include/debug/unordered_map (unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_map(_InputIterator, _InputIterator,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Likewise.
* include/debug/unordered_set (unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_set(_InputIterator, _InputIterator,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
* include/profile/unordered_map (unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_map(_InputIterator, _InputIterator,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Likewise.
* include/profile/unordered_set (unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_set(_InputIterator, _InputIterator,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
From-SVN: r163236
2010-08-14 03:00:23 +02:00
|
|
|
size_type __n = 0,
|
|
|
|
const hasher& __hf = hasher(),
|
|
|
|
const key_equal& __eql = key_equal(),
|
|
|
|
const allocator_type& __a = allocator_type())
|
2009-10-03 04:17:41 +02:00
|
|
|
: _Base(__f, __l, __n, __hf, __eql, __a)
|
|
|
|
{
|
|
|
|
__profcxx_hashtable_construct(this, _Base::bucket_count());
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_multiset(const _Base& __x)
|
|
|
|
: _Base(__x)
|
|
|
|
{
|
|
|
|
__profcxx_hashtable_construct(this, _Base::bucket_count());
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_multiset(unordered_multiset&& __x)
|
2010-08-05 09:34:08 +02:00
|
|
|
: _Base(std::move(__x))
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
|
|
|
__profcxx_hashtable_construct(this, _Base::bucket_count());
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_multiset(initializer_list<value_type> __l,
|
hashtable.h (_Hashtable<>::operator=(const _Hashtable&)): Move inline.
2010-08-13 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/hashtable.h (_Hashtable<>::operator=(const
_Hashtable&)): Move inline.
(operator=(_Hashtable&&)): Define.
* include/bits/unordered_map.h (unordered_map(unordered_map&&),
unordered_map(const unordered_map&), unordered_multimap
(unordered_multimap&&), unordered_multimap(const unordered_multimap&),
__unordered_map(__unordered_map&&), __unordered_map(const
__unordered_map&), __unordered_multimap(__unordered_multimap&&),
__unordered_multimap(const __unordered_multimap&)): Do not define,
leave implicit.
* include/bits/unordered_set.h (unordered_set(unordered_set&&),
unordered_set(const unordered_set&), unordered_multiset
(unordered_multiset&&), unordered_multiset(const unordered_multiset&),
__unordered_set(__unordered_set&&), __unordered_set(const
__unordered_set&), __unordered_multiset(__unordered_multiset&&),
__unordered_multiset(const __unordered_multiset&)): Likewise.
* include/bits/unordered_map.h (__unordered_map(initializer_list<>),
__unordered_map<>::operator=(initializer_list<>),
__unordered_multimap(initializer_list<>), __unordered_multimap<>::
operator=(initializer_list<>)): Add.
* include/bits/unordered_set.h (__unordered_set(initializer_list<>),
__unordered_set<>::operator=(initializer_list<>),
__unordered_multiset(initializer_list<>), __unordered_multiset<>::
operator=(initializer_list<>)): Likewise.
* include/bits/unordered_map.h (__unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Fix __n default to 0.
* include/bits/unordered_set.h (__unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
* include/debug/unordered_map (unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_map(_InputIterator, _InputIterator,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Likewise.
* include/debug/unordered_set (unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_set(_InputIterator, _InputIterator,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
* include/profile/unordered_map (unordered_map(_InputIterator,
_InputIterator, size_type __n), unordered_map(initializer_list<>,
size_type __n), unordered_map(_InputIterator, _InputIterator,
size_type __n), unordered_multimap(initializer_list<>, size_type __n)):
Likewise.
* include/profile/unordered_set (unordered_set(_InputIterator,
_InputIterator, size_type __n), unordered_set(initializer_list<>,
size_type __n), unordered_set(_InputIterator, _InputIterator,
size_type __n), unordered_multiset(initializer_list<>, size_type __n)):
Likewise.
From-SVN: r163236
2010-08-14 03:00:23 +02:00
|
|
|
size_type __n = 0,
|
2009-10-03 04:17:41 +02:00
|
|
|
const hasher& __hf = hasher(),
|
|
|
|
const key_equal& __eql = key_equal(),
|
|
|
|
const allocator_type& __a = allocator_type())
|
|
|
|
: _Base(__l, __n, __hf, __eql, __a) { }
|
|
|
|
|
|
|
|
unordered_multiset&
|
|
|
|
operator=(const unordered_multiset& __x)
|
|
|
|
{
|
|
|
|
*static_cast<_Base*>(this) = __x;
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_multiset&
|
|
|
|
operator=(unordered_multiset&& __x)
|
|
|
|
{
|
2010-01-09 12:16:42 +01:00
|
|
|
// NB: DR 1204.
|
|
|
|
// NB: DR 675.
|
|
|
|
this->clear();
|
|
|
|
this->swap(__x);
|
2009-10-03 04:17:41 +02:00
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
unordered_multiset&
|
|
|
|
operator=(initializer_list<value_type> __l)
|
|
|
|
{
|
|
|
|
this->clear();
|
|
|
|
this->insert(__l);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
2011-06-01 16:16:19 +02:00
|
|
|
~unordered_multiset() noexcept
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
|
|
|
__profcxx_hashtable_destruct(this, _Base::bucket_count(),
|
|
|
|
_Base::size());
|
|
|
|
_M_profile_destruct();
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
swap(unordered_multiset& __x)
|
|
|
|
{
|
|
|
|
_Base::swap(__x);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2011-05-26 17:35:02 +02:00
|
|
|
clear() noexcept
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
|
|
|
__profcxx_hashtable_destruct(this, _Base::bucket_count(),
|
|
|
|
_Base::size());
|
|
|
|
_M_profile_destruct();
|
|
|
|
_Base::clear();
|
|
|
|
}
|
2010-01-03 15:50:09 +01:00
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
void
|
|
|
|
insert(std::initializer_list<value_type> __l)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
|
|
|
_Base::insert(__l);
|
|
|
|
_M_profile_resize(__old_size, _Base::bucket_count());
|
|
|
|
}
|
2010-01-03 15:50:09 +01:00
|
|
|
|
|
|
|
iterator
|
|
|
|
insert(const value_type& __obj)
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
2010-01-03 15:50:09 +01:00
|
|
|
iterator __res = _Base::insert(__obj);
|
2009-10-03 04:17:41 +02:00
|
|
|
_M_profile_resize(__old_size, _Base::bucket_count());
|
|
|
|
return __res;
|
|
|
|
}
|
2010-01-03 15:50:09 +01:00
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
iterator
|
|
|
|
insert(const_iterator __iter, const value_type& __v)
|
2010-10-28 18:01:05 +02:00
|
|
|
{
|
2009-10-03 04:17:41 +02:00
|
|
|
size_type __old_size = _Base::bucket_count();
|
2010-02-10 17:09:42 +01:00
|
|
|
iterator __res = _Base::insert(__iter, __v);
|
|
|
|
_M_profile_resize(__old_size, _Base::bucket_count());
|
|
|
|
return __res;
|
2009-10-03 04:17:41 +02:00
|
|
|
}
|
|
|
|
|
2010-10-28 18:01:05 +02:00
|
|
|
iterator
|
|
|
|
insert(value_type&& __obj)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
|
|
|
iterator __res = _Base::insert(std::move(__obj));
|
|
|
|
_M_profile_resize(__old_size, _Base::bucket_count());
|
|
|
|
return __res;
|
|
|
|
}
|
|
|
|
|
|
|
|
iterator
|
|
|
|
insert(const_iterator __iter, value_type&& __v)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
|
|
|
iterator __res = _Base::insert(__iter, std::move(__v));
|
|
|
|
_M_profile_resize(__old_size, _Base::bucket_count());
|
|
|
|
return __res;
|
|
|
|
}
|
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
template<typename _InputIter>
|
2010-02-10 17:09:42 +01:00
|
|
|
void
|
|
|
|
insert(_InputIter __first, _InputIter __last)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
|
|
|
_Base::insert(__first, __last);
|
|
|
|
_M_profile_resize(__old_size, _Base::bucket_count());
|
|
|
|
}
|
2009-10-03 04:17:41 +02:00
|
|
|
|
|
|
|
void
|
|
|
|
insert(const value_type* __first, const value_type* __last)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
|
|
|
_Base::insert(__first, __last);
|
|
|
|
_M_profile_resize(__old_size, _Base::bucket_count());
|
|
|
|
}
|
|
|
|
|
|
|
|
void rehash(size_type __n)
|
|
|
|
{
|
|
|
|
size_type __old_size = _Base::bucket_count();
|
|
|
|
_Base::rehash(__n);
|
|
|
|
_M_profile_resize(__old_size, _Base::bucket_count());
|
|
|
|
}
|
2010-01-03 15:50:09 +01:00
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
private:
|
|
|
|
_Base&
|
2011-05-26 17:35:02 +02:00
|
|
|
_M_base() noexcept { return *this; }
|
2009-10-03 04:17:41 +02:00
|
|
|
|
|
|
|
const _Base&
|
2011-05-26 17:35:02 +02:00
|
|
|
_M_base() const noexcept { return *this; }
|
2009-10-03 04:17:41 +02:00
|
|
|
|
2010-02-10 17:09:42 +01:00
|
|
|
void
|
|
|
|
_M_profile_resize(size_type __old_size, size_type __new_size)
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
|
|
|
if (__old_size != __new_size)
|
|
|
|
__profcxx_hashtable_resize(this, __old_size, __new_size);
|
|
|
|
}
|
|
|
|
|
2010-02-10 17:09:42 +01:00
|
|
|
void
|
|
|
|
_M_profile_destruct()
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
|
|
|
size_type __hops = 0, __lc = 0, __chain = 0;
|
2010-02-10 17:09:42 +01:00
|
|
|
for (iterator __it = _M_base().begin(); __it != _M_base().end();
|
|
|
|
++__it)
|
2009-10-03 04:17:41 +02:00
|
|
|
{
|
2010-02-10 17:09:42 +01:00
|
|
|
while (__it._M_cur_node->_M_next)
|
|
|
|
{
|
|
|
|
++__chain;
|
|
|
|
++__it;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (__chain)
|
|
|
|
{
|
|
|
|
++__chain;
|
|
|
|
__lc = __lc > __chain ? __lc : __chain;
|
|
|
|
__hops += __chain * (__chain - 1) / 2;
|
|
|
|
__chain = 0;
|
|
|
|
}
|
2009-10-03 04:17:41 +02:00
|
|
|
}
|
|
|
|
__profcxx_hashtable_destruct2(this, __lc, _Base::size(), __hops);
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
2010-02-10 17:09:42 +01:00
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
|
|
|
|
inline void
|
|
|
|
swap(unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
|
2010-02-10 17:09:42 +01:00
|
|
|
unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
|
2009-10-03 04:17:41 +02:00
|
|
|
{ __x.swap(__y); }
|
|
|
|
|
2010-03-26 03:19:10 +01:00
|
|
|
template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
|
|
|
|
inline bool
|
|
|
|
operator==(const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
|
|
|
|
const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
|
|
|
|
{ return __x._M_equal(__y); }
|
|
|
|
|
|
|
|
template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
|
|
|
|
inline bool
|
|
|
|
operator!=(const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
|
|
|
|
const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
|
|
|
|
{ return !(__x == __y); }
|
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
} // namespace __profile
|
|
|
|
} // namespace std
|
|
|
|
|
|
|
|
#undef _GLIBCXX_BASE
|
|
|
|
#undef _GLIBCXX_STD_BASE
|
|
|
|
|
2010-03-30 12:59:17 +02:00
|
|
|
#endif // __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
|
2009-10-03 04:17:41 +02:00
|
|
|
#endif
|