[Boost-commit] svn:boost r44463 - in branches/unordered/trunk/boost: . unordered/detail

From: daniel_james_at_[hidden]
Date: 2008-04-16 13:35:11

Author: danieljames
Date: 2008-04-16 13:35:11 EDT (Wed, 16 Apr 2008)
New Revision: 44463
URL: http://svn.boost.org/trac/boost/changeset/44463

Log:
Explicitly name the different insert overloads.

Text files modified: 
   branches/unordered/trunk/boost/unordered/detail/hash_table_impl.hpp |    10 +++++-----                              
   branches/unordered/trunk/boost/unordered_map.hpp                    |     8 ++++----                                
   branches/unordered/trunk/boost/unordered_set.hpp                    |     8 ++++----                                
   3 files changed, 13 insertions(+), 13 deletions(-)

Modified: branches/unordered/trunk/boost/unordered/detail/hash_table_impl.hpp
==============================================================================
--- branches/unordered/trunk/boost/unordered/detail/hash_table_impl.hpp	(original)
+++ branches/unordered/trunk/boost/unordered/detail/hash_table_impl.hpp	2008-04-16 13:35:11 EDT (Wed, 16 Apr 2008)
@@ -1062,7 +1062,7 @@
                 calculate_max_load(); // no throw
 
                 // This can throw, but BOOST_UNORDERED_TABLE_DATA's destructor will clean up.
-                insert(i, j);
+                insert_range(i, j);
             }
 
             // Copy Construct
@@ -1535,7 +1535,7 @@
 
             // if hash function throws, basic exception safety
             // strong otherwise
-            iterator_base insert(iterator_base const& it, value_type const& v)
+            iterator_base insert_hint(iterator_base const& it, value_type const& v)
             {
                 // equal can throw, but with no effects
                 if (it == data_.end() || !equal(extract_key(v), *it)) {
@@ -1617,7 +1617,7 @@
             // if hash function throws, or inserting > 1 element, basic exception safety
             // strong otherwise
             template <typename I>
-            void insert(I i, I j)
+            void insert_range(I i, I j)
             {
                 BOOST_DEDUCED_TYPENAME boost::iterator_traversal<I>::type
                     iterator_traversal_tag;
@@ -1702,7 +1702,7 @@
 
             // if hash function throws, basic exception safety
             // strong otherwise
-            iterator_base insert(iterator_base const& it, value_type const& v)
+            iterator_base insert_hint(iterator_base const& it, value_type const& v)
             {
                 if(it != data_.end() && equal(extract_key(v), *it))
                     return it;
@@ -1735,7 +1735,7 @@
             // if hash function throws, or inserting > 1 element, basic exception safety
             // strong otherwise
             template <typename InputIterator>
-            void insert(InputIterator i, InputIterator j)
+            void insert_range(InputIterator i, InputIterator j)
             {
                 node_constructor a(data_.allocators_);
 

Modified: branches/unordered/trunk/boost/unordered_map.hpp
==============================================================================
--- branches/unordered/trunk/boost/unordered_map.hpp	(original)
+++ branches/unordered/trunk/boost/unordered_map.hpp	2008-04-16 13:35:11 EDT (Wed, 16 Apr 2008)
@@ -207,13 +207,13 @@
 
         iterator insert(const_iterator hint, const value_type& obj)
         {
-            return iterator(base.insert(get(hint), obj));
+            return iterator(base.insert_hint(get(hint), obj));
         }
 
         template <class InputIterator>
             void insert(InputIterator first, InputIterator last)
         {
-            base.insert(first, last);
+            base.insert_range(first, last);
         }
 
         iterator erase(const_iterator position)
@@ -560,13 +560,13 @@
 
         iterator insert(const_iterator hint, const value_type& obj)
         {
-            return iterator(base.insert(get(hint), obj));
+            return iterator(base.insert_hint(get(hint), obj));
         }
 
         template <class InputIterator>
             void insert(InputIterator first, InputIterator last)
         {
-            base.insert(first, last);
+            base.insert_range(first, last);
         }
 
         iterator erase(const_iterator position)

Modified: branches/unordered/trunk/boost/unordered_set.hpp
==============================================================================
--- branches/unordered/trunk/boost/unordered_set.hpp	(original)
+++ branches/unordered/trunk/boost/unordered_set.hpp	2008-04-16 13:35:11 EDT (Wed, 16 Apr 2008)
@@ -204,13 +204,13 @@
 
         iterator insert(const_iterator hint, const value_type& obj)
         {
-            return iterator(base.insert(get(hint), obj));
+            return iterator(base.insert_hint(get(hint), obj));
         }
 
         template <class InputIterator>
             void insert(InputIterator first, InputIterator last)
         {
-            base.insert(first, last);
+            base.insert_range(first, last);
         }
 
         iterator erase(const_iterator position)
@@ -527,13 +527,13 @@
 
         iterator insert(const_iterator hint, const value_type& obj)
         {
-            return iterator(base.insert(get(hint), obj));
+            return iterator(base.insert_hint(get(hint), obj));
         }
 
         template <class InputIterator>
             void insert(InputIterator first, InputIterator last)
         {
-            base.insert(first, last);
+            base.insert_range(first, last);
         }
 
         iterator erase(const_iterator position)