diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-01-03 14:50:09 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-01-03 14:50:09 +0000 |
| commit | 30abb701b1e8fc345d49a81232942b282ec8aef8 (patch) | |
| tree | cf5f69958c571b59e816f33865c5ed216a4f9983 /libstdc++-v3/include/profile/unordered_map | |
| parent | 90bd219d592763880997f95fe5f2243d4b7b3570 (diff) | |
| download | ppe42-gcc-30abb701b1e8fc345d49a81232942b282ec8aef8.tar.gz ppe42-gcc-30abb701b1e8fc345d49a81232942b282ec8aef8.zip | |
2010-01-03 Paolo Carlini <paolo.carlini@oracle.com>
* include/tr1_impl/hashtable (_Hashtable<>): Remove insert_return_type
typedef.
* include/profile/unordered_map (unordered_map<>::insert(const
value_type&), unordered_multimap<>::insert(const value_type&)): Adjust.
* include/profile/unordered_set (unordered_set<>::insert(const
value_type&), unordered_multimap<>::insert(const value_type&)):
Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@155587 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/profile/unordered_map')
| -rw-r--r-- | libstdc++-v3/include/profile/unordered_map | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libstdc++-v3/include/profile/unordered_map b/libstdc++-v3/include/profile/unordered_map index 2f563a61b96..b8adc44108b 100644 --- a/libstdc++-v3/include/profile/unordered_map +++ b/libstdc++-v3/include/profile/unordered_map @@ -1,6 +1,6 @@ // Profiling unordered_map/unordered_multimap implementation -*- C++ -*- -// Copyright (C) 2009 Free Software Foundation, Inc. +// Copyright (C) 2009, 2010 Free Software Foundation, Inc. // // 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 @@ -72,8 +72,6 @@ namespace __profile typedef typename _Base::reference reference; typedef typename _Base::const_reference const_reference; typedef typename _Base::mapped_type mapped_type; - typedef std::pair<typename _Base::iterator, bool> pair_type; - typedef typename _Base::insert_return_type insert_return_type; typedef typename _Base::iterator iterator; typedef typename _Base::const_iterator const_iterator; @@ -148,7 +146,8 @@ namespace __profile ~unordered_map() { - __profcxx_hashtable_destruct(this, _Base::bucket_count(), _Base::size()); + __profcxx_hashtable_destruct(this, _Base::bucket_count(), + _Base::size()); _M_profile_destruct(); } @@ -162,7 +161,8 @@ namespace __profile void clear() { - __profcxx_hashtable_destruct(this, _Base::bucket_count(), _Base::size()); + __profcxx_hashtable_destruct(this, _Base::bucket_count(), + _Base::size()); _M_profile_destruct(); _Base::clear(); } @@ -175,14 +175,15 @@ namespace __profile _M_profile_resize(__old_size, _Base::bucket_count()); } - insert_return_type + std::pair<iterator, bool> insert(const value_type& __obj) { size_type __old_size = _Base::bucket_count(); - insert_return_type __res = _Base::insert(__obj); + std::pair<iterator, bool> __res = _Base::insert(__obj); _M_profile_resize(__old_size, _Base::bucket_count()); return __res; } + iterator insert(iterator __iter, const value_type& __v) { @@ -301,8 +302,6 @@ namespace __profile typedef typename _Base::difference_type difference_type; typedef typename _Base::reference reference; typedef typename _Base::const_reference const_reference; - typedef std::pair<typename _Base::iterator, bool> pair_type; - typedef typename _Base::insert_return_type insert_return_type; typedef typename _Base::iterator iterator; typedef typename _Base::const_iterator const_iterator; @@ -401,14 +400,15 @@ namespace __profile _M_profile_resize(__old_size, _Base::bucket_count()); } - insert_return_type + iterator insert(const value_type& __obj) { size_type __old_size = _Base::bucket_count(); - insert_return_type __res = _Base::insert(__obj); + iterator __res = _Base::insert(__obj); _M_profile_resize(__old_size, _Base::bucket_count()); return __res; } + iterator insert(iterator __iter, const value_type& __v) { |
