[Boost-commit] svn:boost r42941 - branches/unordered/trunk/libs/unordered/test/objects

From: daniel_james_at_[hidden]
Date: 2008-01-23 18:35:02

Author: danieljames
Date: 2008-01-23 18:35:01 EST (Wed, 23 Jan 2008)
New Revision: 42941
URL: http://svn.boost.org/trac/boost/changeset/42941

Log:
Fix all the allocators.
Text files modified: 
   branches/unordered/trunk/libs/unordered/test/objects/exception.hpp |     2 +-                                      
   branches/unordered/trunk/libs/unordered/test/objects/minimal.hpp   |     3 ++-                                     
   branches/unordered/trunk/libs/unordered/test/objects/test.hpp      |     2 +-                                      
   3 files changed, 4 insertions(+), 3 deletions(-)

Modified: branches/unordered/trunk/libs/unordered/test/objects/exception.hpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/objects/exception.hpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/objects/exception.hpp	2008-01-23 18:35:01 EST (Wed, 23 Jan 2008)
@@ -313,7 +313,7 @@
             //return pointer(static_cast<T*>(::operator new(n * sizeof(T))));
         }
 
-        pointer allocate(size_type n, const_pointer u)
+        pointer allocate(size_type n, void const* u)
         {
             T* ptr = 0;
             UNORDERED_SCOPE(allocator::allocate(size_type, const_pointer)) {

Modified: branches/unordered/trunk/libs/unordered/test/objects/minimal.hpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/objects/minimal.hpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/objects/minimal.hpp	2008-01-23 18:35:01 EST (Wed, 23 Jan 2008)
@@ -195,7 +195,8 @@
             return pointer(static_cast<T*>(::operator new(n * sizeof(T))));
         }
 
-        pointer allocate(size_type n, const_pointer u)
+        template <class Y>
+        pointer allocate(size_type n, const_ptr<Y> u)
         {
             return pointer(static_cast<T*>(::operator new(n * sizeof(T))));
         }

Modified: branches/unordered/trunk/libs/unordered/test/objects/test.hpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/objects/test.hpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/objects/test.hpp	2008-01-23 18:35:01 EST (Wed, 23 Jan 2008)
@@ -194,7 +194,7 @@
             return ptr;
         }
 
-        pointer allocate(size_type n, const_pointer u)
+        pointer allocate(size_type n, void const* u)
         {
             pointer ptr(static_cast<T*>(::operator new(n * sizeof(T))));
             detail::tracker.track_allocate((void*) ptr, n, sizeof(T), tag_);