Commit 1b4ec7f0 by Paolo Carlini Committed by Paolo Carlini

hashtable.h (_Hashtable<>::_Insert_Conv_Type, [...]): Change to private.

2010-11-10  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/bits/hashtable.h (_Hashtable<>::_Insert_Conv_Type,
	_Hashtable<>::_Insert_Return_Type): Change to private.

From-SVN: r166528
parent 72a07d9b
2010-11-10 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/hashtable.h (_Hashtable<>::_Insert_Conv_Type,
_Hashtable<>::_Insert_Return_Type): Change to private.
2010-11-10 Jonathan Wakely <jwakely.gcc@gmail.com> 2010-11-10 Jonathan Wakely <jwakely.gcc@gmail.com>
* include/bits/unique_ptr.h: Use static_assert in constexpr * include/bits/unique_ptr.h: Use static_assert in constexpr
......
...@@ -362,7 +362,7 @@ namespace std ...@@ -362,7 +362,7 @@ namespace std
equal_range(const key_type& __k) const; equal_range(const key_type& __k) const;
private: private:
// Find, insert and erase helper functions // Find and insert helper functions and types
_Node* _Node*
_M_find_node(_Node*, const key_type&, _M_find_node(_Node*, const key_type&,
typename _Hashtable::_Hash_code_type) const; typename _Hashtable::_Hash_code_type) const;
...@@ -380,8 +380,6 @@ namespace std ...@@ -380,8 +380,6 @@ namespace std
iterator iterator
_M_insert(_Pair&&, std::false_type); _M_insert(_Pair&&, std::false_type);
public:
// Insert and erase
typedef typename std::conditional<__unique_keys, typedef typename std::conditional<__unique_keys,
std::pair<iterator, bool>, std::pair<iterator, bool>,
iterator>::type iterator>::type
...@@ -393,6 +391,8 @@ namespace std ...@@ -393,6 +391,8 @@ namespace std
>::type >::type
_Insert_Conv_Type; _Insert_Conv_Type;
public:
// Insert and erase
_Insert_Return_Type _Insert_Return_Type
insert(const value_type& __v) insert(const value_type& __v)
{ return _M_insert(__v, std::integral_constant<bool, __unique_keys>()); } { return _M_insert(__v, std::integral_constant<bool, __unique_keys>()); }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment