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

From: daniel_james_at_[hidden]
Date: 2008-04-20 08:30:20

Author: danieljames
Date: 2008-04-20 08:30:19 EDT (Sun, 20 Apr 2008)
New Revision: 44616
URL: http://svn.boost.org/trac/boost/changeset/44616

Log:
Merge with trunk, fixes tabs.
Properties modified: 
   branches/unordered/trunk/   (props changed)
Text files modified: 
   branches/unordered/trunk/boost/unordered/detail/hash_table_impl.hpp |    24 ++++++++++++------------                
   branches/unordered/trunk/boost/unordered/detail/move.hpp            |     8 ++++----                                
   2 files changed, 16 insertions(+), 16 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-20 08:30:19 EDT (Sun, 20 Apr 2008)
@@ -819,7 +819,7 @@
                 BOOST_ASSERT(base == end.bucket_);
 
                 split_group(end.node_);
-            
+
                 link_ptr ptr(base->next_);
                 base->next_ = end.node_;
 
@@ -1272,7 +1272,7 @@
             //
             // Swap's behaviour when allocators aren't equal is in dispute, for
             // details see:
-            // 
+            //
             // http://unordered.nfshost.com/doc/html/unordered/rationale.html#swapping_containers_with_unequal_allocators
             //
             // ----------------------------------------------------------------
@@ -1284,13 +1284,13 @@
 
             void swap(BOOST_UNORDERED_TABLE& x)
             {
-            	// The swap code can work when swapping a container with itself
-            	// but it triggers an assertion in buffered_functions.
-            	// At the moment, I'd rather leave that assertion in and add a
-            	// check here, rather than remove the assertion. I might change
-            	// this at a later date.
-            	if(this == &x) return;
-            
+                // The swap code can work when swapping a container with itself
+                // but it triggers an assertion in buffered_functions.
+                // At the moment, I'd rather leave that assertion in and add a
+                // check here, rather than remove the assertion. I might change
+                // this at a later date.
+                if(this == &x) return;
+
                 // These can throw, but they only affect the function objects
                 // that aren't in use so it is strongly exception safe, via.
                 // double buffering.
@@ -1846,7 +1846,7 @@
                 size_type hash_value = hash_function()(k);
                 bucket_ptr bucket = data_.bucket_from_hash(hash_value);
                 link_ptr pos = find_iterator(bucket, k);
-                
+
                 if (BOOST_UNORDERED_BORLAND_BOOL(pos)) {
                     // Found an existing key, return it (no throw).
                     return std::pair<iterator_base, bool>(
@@ -1975,7 +1975,7 @@
                     size_type hash_value = hash_function()(extract_key(*i));
                     bucket_ptr bucket = data_.bucket_from_hash(hash_value);
                     link_ptr pos = find_iterator(bucket, extract_key(*i));
-                    
+
                     if (!BOOST_UNORDERED_BORLAND_BOOL(pos)) {
                         // Doesn't already exist, add to bucket.
                         // Side effects only in this block.
@@ -2102,7 +2102,7 @@
         };
 
         // Iterators
-        
+
         template <typename Alloc> class BOOST_UNORDERED_ITERATOR;
         template <typename Alloc> class BOOST_UNORDERED_CONST_ITERATOR;
         template <typename Alloc> class BOOST_UNORDERED_LOCAL_ITERATOR;

Modified: branches/unordered/trunk/boost/unordered/detail/move.hpp
==============================================================================
--- branches/unordered/trunk/boost/unordered/detail/move.hpp	(original)
+++ branches/unordered/trunk/boost/unordered/detail/move.hpp	2008-04-20 08:30:19 EDT (Sun, 20 Apr 2008)
@@ -69,14 +69,14 @@
 /*************************************************************************************************/
 
 /*
-	REVISIT (sparent_at_[hidden]): This is a work around for Boost 1.34.1 and VC++ 2008 where
-	boost::is_convertible<T, T> fails to compile.
+    REVISIT (sparent_at_[hidden]): This is a work around for Boost 1.34.1 and VC++ 2008 where
+    boost::is_convertible<T, T> fails to compile.
 */
 
 template <typename T, typename U>
 struct is_convertible : boost::mpl::or_<
-	boost::is_same<T, U>,
-	boost::is_convertible<T, U>
+    boost::is_same<T, U>,
+    boost::is_convertible<T, U>
 > { };
 
 /*************************************************************************************************/