[Boost-commit] svn:boost r45276 - in branches/unordered/trunk: . boost boost/unordered/detail libs/unordered/test/helpers

From: daniel_james_at_[hidden]
Date: 2008-05-11 08:48:00

Author: danieljames
Date: 2008-05-11 08:47:59 EDT (Sun, 11 May 2008)
New Revision: 45276
URL: http://svn.boost.org/trac/boost/changeset/45276

Log:
Merge in unordered container changes from trunk.

Merged revisions 44703-45274 via svnmerge from 
https://svn.boost.org/svn/boost/trunk

................
  r44968 | danieljames | 2008-05-01 10:23:22 +0100 (Thu, 01 May 2008) | 2 lines
  
  Add list.hpp which was missed from the merge.
................
  r45061 | danieljames | 2008-05-03 13:07:15 +0100 (Sat, 03 May 2008) | 1 line
  
  Old versions on the intel compiler (and I assume other EDG based compilers) don't seem to be able to deal with the SFINAE code used in 'has_move'.
................
  r45261 | danieljames | 2008-05-10 14:52:14 +0100 (Sat, 10 May 2008) | 1 line
  
  Fix a clumsy error.
................
  r45262 | danieljames | 2008-05-10 14:53:35 +0100 (Sat, 10 May 2008) | 3 lines
  
  The unordered containers are failing to compile on Borland. This is a short in
  the dark at fixing that.
................
  r45263 | danieljames | 2008-05-10 14:55:59 +0100 (Sat, 10 May 2008) | 1 line
  
  Remove some code that doesn't even make it past preprocessing, I should have removed it when I wrote separate allocation code for C++0x compilers.
................

Properties modified: 
   branches/unordered/trunk/   (props changed)
Text files modified: 
   branches/unordered/trunk/boost/unordered/detail/config.hpp    |     3 +++                                     
   branches/unordered/trunk/boost/unordered_map.hpp              |     4 ++--                                    
   branches/unordered/trunk/boost/unordered_set.hpp              |     4 ++--                                    
   branches/unordered/trunk/libs/unordered/test/helpers/list.hpp |     2 +-                                      
   4 files changed, 8 insertions(+), 5 deletions(-)

Modified: branches/unordered/trunk/boost/unordered/detail/config.hpp
==============================================================================
--- branches/unordered/trunk/boost/unordered/detail/config.hpp	(original)
+++ branches/unordered/trunk/boost/unordered/detail/config.hpp	2008-05-11 08:47:59 EDT (Sun, 11 May 2008)
@@ -13,6 +13,9 @@
 #elif defined(__GNUC__) && \
     (__GNUC__ < 3 || __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
 #  define BOOST_UNORDERED_NO_HAS_MOVE_ASSIGN
+#elif BOOST_WORKAROUND(BOOST_INTEL, < 900) || \
+    BOOST_WORKAROUND(__EDG_VERSION__, < 304)
+#  define BOOST_UNORDERED_NO_HAS_MOVE_ASSIGN
 #endif
 
 #endif

Modified: branches/unordered/trunk/boost/unordered_map.hpp
==============================================================================
--- branches/unordered/trunk/boost/unordered_map.hpp	(original)
+++ branches/unordered/trunk/boost/unordered_map.hpp	2008-05-11 08:47:59 EDT (Sun, 11 May 2008)
@@ -121,7 +121,7 @@
             return *this;
         }
 #else
-        unordered_map(boost::unordered_detail::move_from<unordered_map> other)
+        unordered_map(boost::unordered_detail::move_from<unordered_map<Key, T, Hash, Pred, Alloc> > other)
             : base(other.base, boost::unordered_detail::move_tag())
         {
         }
@@ -504,7 +504,7 @@
             return *this;
         }
 #else
-        unordered_multimap(boost::unordered_detail::move_from<unordered_multimap> other)
+        unordered_multimap(boost::unordered_detail::move_from<unordered_multimap<Key, T, Hash, Pred, Alloc> > other)
             : base(other.base, boost::unordered_detail::move_tag())
         {
         }

Modified: branches/unordered/trunk/boost/unordered_set.hpp
==============================================================================
--- branches/unordered/trunk/boost/unordered_set.hpp	(original)
+++ branches/unordered/trunk/boost/unordered_set.hpp	2008-05-11 08:47:59 EDT (Sun, 11 May 2008)
@@ -118,7 +118,7 @@
             return *this;
         }
 #else
-        unordered_set(boost::unordered_detail::move_from<unordered_set> other)
+        unordered_set(boost::unordered_detail::move_from<unordered_set<Value, Hash, Pred, Alloc> > other)
             : base(other.base, boost::unordered_detail::move_tag())
         {
         }
@@ -473,7 +473,7 @@
             return *this;
         }
 #else
-        unordered_multiset(boost::unordered_detail::move_from<unordered_multiset> other)
+        unordered_multiset(boost::unordered_detail::move_from<unordered_multiset<Value, Hash, Pred, Alloc> > other)
             : base(other.base, boost::unordered_detail::move_tag())
         {
         }

Modified: branches/unordered/trunk/libs/unordered/test/helpers/list.hpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/helpers/list.hpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/helpers/list.hpp	2008-05-11 08:47:59 EDT (Sun, 11 May 2008)
@@ -161,7 +161,7 @@
 
         void push_front(value_type const& v) {
             data_.first_ = new node(v, data_.first_);
-            if(data_.size_) data_.last_ptr_ = &(*data_.last_ptr_)->next_;
+            if(!data_.size_) data_.last_ptr_ = &(*data_.last_ptr_)->next_;
             ++data_.size_;
         }