[Boost-sandbox-cvs] boost-sandbox/boost/unordered/detail allocator.hpp, 1.6, 1.7 hash_table.hpp, 1.11, 1.12 hash_table_impl.hpp, 1.11, 1.12

[Daniel J. <dan...@us...>]

Update of /cvsroot/boost-sandbox/boost-sandbox/boost/unordered/detail
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32539/boost/unordered/detail

Modified Files:
	allocator.hpp hash_table.hpp hash_table_impl.hpp 
Log Message:
Import latest changes to the unordered containers. Includes:

Copyright update.
Switch back to the version where the sentinel points to itself.
Remove alternative versions of swap.
Workaround a borland bug or two.
More consistent use of class/swap/template.
Avoid a few warnings.
Add a no-throw swap to the allocator for exception testing.



Index: hash_table_impl.hpp
===================================================================
RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/unordered/detail/hash_table_impl.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- hash_table_impl.hpp	25 Feb 2007 21:09:38 -0000	1.11
+++ hash_table_impl.hpp	18 Mar 2007 20:00:57 -0000	1.12
@@ -1,6 +1,6 @@
 
 // Copyright (C) 2003-2004 Jeremy B. Maitin-Shepard.
-// Copyright (C) 2005-2006 Daniel James
+// Copyright (C) 2005-2007 Daniel James
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -28,13 +28,13 @@
         //
         // Responsible for managing the hash buckets.
 
[...1144 lines suppressed...]
-        template <class Alloc>
+        template <typename Alloc>
         class HASH_ITERATOR
             : public boost::iterator <
                 std::forward_iterator_tag,
@@ -2044,7 +2006,7 @@
             bool operator!=(const_iterator const& x) const { return base_ != x.base_; }
         };
 
-        template <class Alloc>
+        template <typename Alloc>
         class HASH_CONST_ITERATOR
             : public boost::iterator <
                 std::forward_iterator_tag,
@@ -2088,5 +2050,3 @@
 #undef HASH_LOCAL_ITERATOR
 #undef HASH_CONST_LOCAL_ITERATOR
 
-
-

Index: allocator.hpp
===================================================================
RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/unordered/detail/allocator.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- allocator.hpp	31 Oct 2006 22:11:25 -0000	1.6
+++ allocator.hpp	18 Mar 2007 20:00:57 -0000	1.7
@@ -1,5 +1,5 @@
 
-// Copyright 2005 Daniel James.
+// Copyright 2005-2007 Daniel James.
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 

Index: hash_table.hpp
===================================================================
RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/unordered/detail/hash_table.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- hash_table.hpp	1 Jul 2006 22:34:48 -0000	1.11
+++ hash_table.hpp	18 Mar 2007 20:00:57 -0000	1.12
@@ -1,6 +1,6 @@
 
 // Copyright (C) 2003-2004 Jeremy B. Maitin-Shepard.
-// Copyright (C) 2005-2006 Daniel James
+// Copyright (C) 2005-2007 Daniel James
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -33,15 +33,6 @@
 
 #include <boost/mpl/aux_/config/eti.hpp>
 
-// See hash_table::swap() for details about this.
-#if !defined(BOOST_UNORDERED_SWAP_METHOD)
-#define BOOST_UNORDERED_SWAP_METHOD 3
-#endif
-
-#if BOOST_UNORDERED_SWAP_METHOD == 1
-#include <stdexcept>
-#endif
-
 #if BOOST_WORKAROUND(__BORLANDC__, <= 0x0551)
 #define BOOST_HASH_BORLAND_BOOL(x) (bool)(x)
 #else