Changeset 44616


Ignore:
Timestamp:
Apr 20, 2008, 12:30:19 PM (10 years ago)
Author:
Daniel James
Message:

Merge with trunk, fixes tabs.

Location:
branches/unordered/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/unordered/trunk

  • branches/unordered/trunk/boost/unordered/detail/hash_table_impl.hpp

    r44536 r44616  
    820820
    821821                split_group(end.node_);
    822            
     822
    823823                link_ptr ptr(base->next_);
    824824                base->next_ = end.node_;
     
    12731273            // Swap's behaviour when allocators aren't equal is in dispute, for
    12741274            // details see:
    1275             // 
     1275            //
    12761276            // http://unordered.nfshost.com/doc/html/unordered/rationale.html#swapping_containers_with_unequal_allocators
    12771277            //
     
    12851285            void swap(BOOST_UNORDERED_TABLE& x)
    12861286            {
    1287                 // The swap code can work when swapping a container with itself
    1288                 // but it triggers an assertion in buffered_functions.
    1289                 // At the moment, I'd rather leave that assertion in and add a
    1290                 // check here, rather than remove the assertion. I might change
    1291                 // this at a later date.
    1292                 if(this == &x) return;
    1293            
     1287                // The swap code can work when swapping a container with itself
     1288                // but it triggers an assertion in buffered_functions.
     1289                // At the moment, I'd rather leave that assertion in and add a
     1290                // check here, rather than remove the assertion. I might change
     1291                // this at a later date.
     1292                if(this == &x) return;
     1293
    12941294                // These can throw, but they only affect the function objects
    12951295                // that aren't in use so it is strongly exception safe, via.
     
    18471847                bucket_ptr bucket = data_.bucket_from_hash(hash_value);
    18481848                link_ptr pos = find_iterator(bucket, k);
    1849                
     1849
    18501850                if (BOOST_UNORDERED_BORLAND_BOOL(pos)) {
    18511851                    // Found an existing key, return it (no throw).
     
    19761976                    bucket_ptr bucket = data_.bucket_from_hash(hash_value);
    19771977                    link_ptr pos = find_iterator(bucket, extract_key(*i));
    1978                    
     1978
    19791979                    if (!BOOST_UNORDERED_BORLAND_BOOL(pos)) {
    19801980                        // Doesn't already exist, add to bucket.
     
    21032103
    21042104        // Iterators
    2105        
     2105
    21062106        template <typename Alloc> class BOOST_UNORDERED_ITERATOR;
    21072107        template <typename Alloc> class BOOST_UNORDERED_CONST_ITERATOR;
  • branches/unordered/trunk/boost/unordered/detail/move.hpp

    r44470 r44616  
    7070
    7171/*
    72         REVISIT (sparent@adobe.com): This is a work around for Boost 1.34.1 and VC++ 2008 where
    73         boost::is_convertible<T, T> fails to compile.
     72    REVISIT (sparent@adobe.com): This is a work around for Boost 1.34.1 and VC++ 2008 where
     73    boost::is_convertible<T, T> fails to compile.
    7474*/
    7575
    7676template <typename T, typename U>
    7777struct is_convertible : boost::mpl::or_<
    78         boost::is_same<T, U>,
    79         boost::is_convertible<T, U>
     78    boost::is_same<T, U>,
     79    boost::is_convertible<T, U>
    8080> { };
    8181
Note: See TracChangeset for help on using the changeset viewer.