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

From: daniel_james_at_[hidden]
Date: 2008-05-25 12:39:29

Author: danieljames
Date: 2008-05-25 12:39:29 EDT (Sun, 25 May 2008)
New Revision: 45743
URL: http://svn.boost.org/trac/boost/changeset/45743

Log:
Merge in C++0x allocator from unordered/dev.
Added:
   branches/unordered/trunk/boost/unordered/detail/allocator.hpp
      - copied unchanged from r44054, /branches/unordered/dev/boost/unordered/detail/allocator.hpp
Properties modified: 
   branches/unordered/trunk/   (props changed)
Text files modified: 
   branches/unordered/trunk/boost/unordered_map.hpp |     6 +++---                                  
   branches/unordered/trunk/boost/unordered_set.hpp |     6 +++---                                  
   2 files changed, 6 insertions(+), 6 deletions(-)

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-25 12:39:29 EDT (Sun, 25 May 2008)
@@ -16,10 +16,10 @@
 #include <boost/config.hpp>
 
 #include <functional>
-#include <memory>
 
 #include <boost/functional/hash.hpp>
 #include <boost/unordered/detail/hash_table.hpp>
+#include <boost/unordered/detail/allocator.hpp>
 
 #if !defined(BOOST_HAS_RVALUE_REFS)
 #include <boost/unordered/detail/move.hpp>
@@ -31,7 +31,7 @@
         class T,
         class Hash = hash<Key>,
         class Pred = std::equal_to<Key>,
-        class Alloc = std::allocator<std::pair<const Key, T> > >
+        class Alloc = boost::unordered_detail::allocator<std::pair<const Key, T> > >
     class unordered_map
     {
         typedef boost::unordered_detail::hash_types_unique_keys<
@@ -417,7 +417,7 @@
         class T,
         class Hash = hash<Key>,
         class Pred = std::equal_to<Key>,
-        class Alloc = std::allocator<std::pair<const Key, T> > >
+        class Alloc = boost::unordered_detail::allocator<std::pair<const Key, T> > >
     class unordered_multimap
     {
         typedef boost::unordered_detail::hash_types_equivalent_keys<

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-25 12:39:29 EDT (Sun, 25 May 2008)
@@ -16,10 +16,10 @@
 #include <boost/config.hpp>
 
 #include <functional>
-#include <memory>
 
 #include <boost/functional/hash.hpp>
 #include <boost/unordered/detail/hash_table.hpp>
+#include <boost/unordered/detail/allocator.hpp>
 
 #if !defined(BOOST_HAS_RVALUE_REFS)
 #include <boost/unordered/detail/move.hpp>
@@ -30,7 +30,7 @@
     template <class Value,
         class Hash = hash<Value>,
         class Pred = std::equal_to<Value>,
-        class Alloc = std::allocator<Value> >
+        class Alloc = boost::unordered_detail::allocator<Value> >
     class unordered_set
     {
         typedef boost::unordered_detail::hash_types_unique_keys<
@@ -387,7 +387,7 @@
     template <class Value,
         class Hash = hash<Value>,
         class Pred = std::equal_to<Value>,
-        class Alloc = std::allocator<Value> >
+        class Alloc = boost::unordered_detail::allocator<Value> >
     class unordered_multiset
     {
         typedef boost::unordered_detail::hash_types_equivalent_keys<