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

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

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

Log:
Explicitly name the different erase overloads.

Text files modified: 
   branches/unordered/trunk/boost/unordered/detail/hash_table_impl.hpp |     8 ++++----                                
   branches/unordered/trunk/boost/unordered_map.hpp                    |     8 ++++----                                
   branches/unordered/trunk/boost/unordered_set.hpp                    |     8 ++++----                                
   3 files changed, 12 insertions(+), 12 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:22 EDT (Wed, 16 Apr 2008)
@@ -856,7 +856,7 @@
                 return next;
             }
 
-            iterator_base erase(iterator_base r1, iterator_base r2)
+            iterator_base erase_range(iterator_base r1, iterator_base r2)
             {
                 if(r1 != r2)
                 {
@@ -1777,7 +1777,7 @@
             }
 
             // strong exception safety
-            size_type erase(key_type const& k)
+            size_type erase_key(key_type const& k)
             {
                 // No side effects in initial section
                 bucket_ptr bucket = get_bucket(k);
@@ -1788,9 +1788,9 @@
             }
 
             // no throw
-            iterator_base erase(iterator_base const& r1, iterator_base const& r2)
+            iterator_base erase_range(iterator_base const& r1, iterator_base const& r2)
             {
-                return data_.data::erase(r1, r2);
+                return data_.data::erase_range(r1, r2);
             }
 
             // count

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:22 EDT (Wed, 16 Apr 2008)
@@ -223,12 +223,12 @@
 
         size_type erase(const key_type& k)
         {
-            return base.erase(k);
+            return base.erase_key(k);
         }
 
         iterator erase(const_iterator first, const_iterator last)
         {
-            return iterator(base.erase(get(first), get(last)));
+            return iterator(base.erase_range(get(first), get(last)));
         }
 
         void clear()
@@ -576,12 +576,12 @@
 
         size_type erase(const key_type& k)
         {
-            return base.erase(k);
+            return base.erase_key(k);
         }
 
         iterator erase(const_iterator first, const_iterator last)
         {
-            return iterator(base.erase(get(first), get(last)));
+            return iterator(base.erase_range(get(first), get(last)));
         }
 
         void clear()

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:22 EDT (Wed, 16 Apr 2008)
@@ -220,12 +220,12 @@
 
         size_type erase(const key_type& k)
         {
-            return base.erase(k);
+            return base.erase_key(k);
         }
 
         iterator erase(const_iterator first, const_iterator last)
         {
-            return iterator(base.erase(get(first), get(last)));
+            return iterator(base.erase_range(get(first), get(last)));
         }
 
         void clear()
@@ -543,12 +543,12 @@
 
         size_type erase(const key_type& k)
         {
-            return base.erase(k);
+            return base.erase_key(k);
         }
 
         iterator erase(const_iterator first, const_iterator last)
         {
-            return iterator(base.erase(get(first), get(last)));
+            return iterator(base.erase_range(get(first), get(last)));
         }
 
         void clear()