[Boost-commit] svn:boost r43118 - in trunk: . libs/unordered/test/exception libs/unordered/test/unordered

From: daniel_james_at_[hidden]
Date: 2008-02-05 15:57:03

Author: danieljames
Date: 2008-02-05 15:57:02 EST (Tue, 05 Feb 2008)
New Revision: 43118
URL: http://svn.boost.org/trac/boost/changeset/43118

Log:
Merged revisions 42942-43116 via svnmerge from 
https://svn.boost.org/svn/boost/branches/unordered/trunk

........
  r42975 | danieljames | 2008-01-26 00:29:32 +0000 (Sat, 26 Jan 2008) | 1 line
  
  Typedef some types before using them, to make life easier for Borland.
........
  r43116 | danieljames | 2008-02-05 20:47:44 +0000 (Tue, 05 Feb 2008) | 1 line
  
  Some compilers and libraries combinations have problems with deques of non-assingable types. Using a list instead.
........

Properties modified: 
   trunk/   (props changed)
Text files modified: 
   trunk/libs/unordered/test/exception/assign_exception_tests.cpp |     8 ++++++--                                
   trunk/libs/unordered/test/exception/swap_exception_tests.cpp   |    12 ++++++++----                            
   trunk/libs/unordered/test/unordered/equivalent_keys_tests.cpp  |     4 ++--                                    
   3 files changed, 16 insertions(+), 8 deletions(-)

Modified: trunk/libs/unordered/test/exception/assign_exception_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/exception/assign_exception_tests.cpp	(original)
+++ trunk/libs/unordered/test/exception/assign_exception_tests.cpp	2008-02-05 15:57:02 EST (Tue, 05 Feb 2008)
@@ -36,10 +36,14 @@
     const test::random_values<T> x_values, y_values;
     const T x,y;
 
+    typedef BOOST_DEDUCED_TYPENAME T::hasher hasher;
+    typedef BOOST_DEDUCED_TYPENAME T::key_equal key_equal;
+    typedef BOOST_DEDUCED_TYPENAME T::allocator_type allocator_type;
+
     assign_base(unsigned int count1, unsigned int count2, int tag1, int tag2)
         : x_values(count1), y_values(count2),
-        x(x_values.begin(), x_values.end(), 0, BOOST_DEDUCED_TYPENAME T::hasher(tag1), BOOST_DEDUCED_TYPENAME T::key_equal(tag1), BOOST_DEDUCED_TYPENAME T::allocator_type(tag1)),
-        y(y_values.begin(), y_values.end(), 0, BOOST_DEDUCED_TYPENAME T::hasher(tag2), BOOST_DEDUCED_TYPENAME T::key_equal(tag2), BOOST_DEDUCED_TYPENAME T::allocator_type(tag2)) {}
+        x(x_values.begin(), x_values.end(), 0, hasher(tag1), key_equal(tag1), allocator_type(tag1)),
+        y(y_values.begin(), y_values.end(), 0, hasher(tag2), key_equal(tag2), allocator_type(tag2)) {}
 
     typedef T data_type;
     T init() const { return T(x); }

Modified: trunk/libs/unordered/test/exception/swap_exception_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/exception/swap_exception_tests.cpp	(original)
+++ trunk/libs/unordered/test/exception/swap_exception_tests.cpp	2008-02-05 15:57:02 EST (Tue, 05 Feb 2008)
@@ -48,12 +48,16 @@
     const test::random_values<T> x_values, y_values;
     const T initial_x, initial_y;
 
+    typedef BOOST_DEDUCED_TYPENAME T::hasher hasher;
+    typedef BOOST_DEDUCED_TYPENAME T::key_equal key_equal;
+    typedef BOOST_DEDUCED_TYPENAME T::allocator_type allocator_type;
+
     swap_base(unsigned int count1, unsigned int count2, int tag1, int tag2)
         : x_values(count1), y_values(count2),
-        initial_x(x_values.begin(), x_values.end(), 0, BOOST_DEDUCED_TYPENAME T::hasher(tag1),
-                BOOST_DEDUCED_TYPENAME T::key_equal(tag1), BOOST_DEDUCED_TYPENAME T::allocator_type(tag1)),
-        initial_y(y_values.begin(), y_values.end(), 0, BOOST_DEDUCED_TYPENAME T::hasher(tag2),
-                BOOST_DEDUCED_TYPENAME T::key_equal(tag2), BOOST_DEDUCED_TYPENAME T::allocator_type(tag2))
+        initial_x(x_values.begin(), x_values.end(), 0, hasher(tag1),
+                key_equal(tag1), allocator_type(tag1)),
+        initial_y(y_values.begin(), y_values.end(), 0, hasher(tag2),
+                key_equal(tag2), allocator_type(tag2))
     {}
 
     struct data_type {

Modified: trunk/libs/unordered/test/unordered/equivalent_keys_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/equivalent_keys_tests.cpp	(original)
+++ trunk/libs/unordered/test/unordered/equivalent_keys_tests.cpp	2008-02-05 15:57:02 EST (Tue, 05 Feb 2008)
@@ -8,7 +8,7 @@
 #include <boost/detail/lightweight_test.hpp>
 #include <algorithm>
 #include <map>
-#include <deque>
+#include <list>
 #include "../helpers/tracker.hpp"
 #include "../helpers/invariants.hpp"
 
@@ -57,7 +57,7 @@
 
 void map_tests()
 {
-    typedef std::deque<std::pair<int const, int> > values_type;
+    typedef std::list<std::pair<int const, int> > values_type;
     values_type v[5];
     v[0].push_back(std::pair<int const, int>(1,1));
     v[1].push_back(std::pair<int const, int>(28,34));