diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/hashtable.h | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ab60cb3..c4d9c8f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +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> * include/bits/unique_ptr.h: Use static_assert in constexpr diff --git a/libstdc++-v3/include/bits/hashtable.h b/libstdc++-v3/include/bits/hashtable.h index 343a122..9fa57fc 100644 --- a/libstdc++-v3/include/bits/hashtable.h +++ b/libstdc++-v3/include/bits/hashtable.h @@ -362,7 +362,7 @@ namespace std equal_range(const key_type& __k) const; private: - // Find, insert and erase helper functions + // Find and insert helper functions and types _Node* _M_find_node(_Node*, const key_type&, typename _Hashtable::_Hash_code_type) const; @@ -380,8 +380,6 @@ namespace std iterator _M_insert(_Pair&&, std::false_type); - public: - // Insert and erase typedef typename std::conditional<__unique_keys, std::pair<iterator, bool>, iterator>::type @@ -393,6 +391,8 @@ namespace std >::type _Insert_Conv_Type; + public: + // Insert and erase _Insert_Return_Type insert(const value_type& __v) { return _M_insert(__v, std::integral_constant<bool, __unique_keys>()); } |