[Boost-commit] svn:boost r44050 - branches/unordered/dev/boost/unordered/detail

From: daniel_james_at_[hidden]
Date: 2008-04-05 08:08:02

Author: danieljames
Date: 2008-04-05 08:08:01 EDT (Sat, 05 Apr 2008)
New Revision: 44050
URL: http://svn.boost.org/trac/boost/changeset/44050

Log:
Fix errors caused by merge.
Text files modified: 
   branches/unordered/dev/boost/unordered/detail/hash_table_impl.hpp |     8 ++++----                                
   1 files changed, 4 insertions(+), 4 deletions(-)

Modified: branches/unordered/dev/boost/unordered/detail/hash_table_impl.hpp
==============================================================================
--- branches/unordered/dev/boost/unordered/detail/hash_table_impl.hpp	(original)
+++ branches/unordered/dev/boost/unordered/detail/hash_table_impl.hpp	2008-04-05 08:08:01 EDT (Sat, 05 Apr 2008)
@@ -1880,8 +1880,8 @@
             {
                 if(this->size() != other.size()) return false;
 
-                for(bucket_ptr i = this->cached_begin_bucket_,
-                        j = this->buckets_end(); i != j; ++i)
+                for(bucket_ptr i = data_.cached_begin_bucket_,
+                        j = data_.buckets_end(); i != j; ++i)
                 {
                     for(link_ptr it(i->next_); BOOST_UNORDERED_BORLAND_BOOL(it); it = data::next_group(it))
                     {
@@ -1921,8 +1921,8 @@
             {
                 std::size_t seed = 0;
 
-                for(bucket_ptr i = this->cached_begin_bucket_,
-                        j = this->buckets_end(); i != j; ++i)
+                for(bucket_ptr i = data_.cached_begin_bucket_,
+                        j = data_.buckets_end(); i != j; ++i)
                 {
                     for(link_ptr it(i->next_); BOOST_UNORDERED_BORLAND_BOOL(it); it = data::next_group(it))
                         seed ^= group_hash(it, (type_wrapper<value_type>*)0);