| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-03-09 20:56:23 +00:00
										 |  |  | // Copyright 2006-2009 Daniel James.
 | 
					
						
							| 
									
										
										
										
											2006-07-01 22:31:26 +00:00
										 |  |  | // 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)
 | 
					
						
							| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | #if !defined(BOOST_UNORDERED_TEST_OBJECTS_HEADER)
 | 
					
						
							|  |  |  | #define BOOST_UNORDERED_TEST_OBJECTS_HEADER
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2006-06-11 19:42:55 +00:00
										 |  |  | #include <boost/config.hpp>
 | 
					
						
							|  |  |  | #include <boost/limits.hpp>
 | 
					
						
							| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  | #include <cstddef>
 | 
					
						
							| 
									
										
										
										
											2008-01-10 22:30:46 +00:00
										 |  |  | #include "../helpers/fwd.hpp"
 | 
					
						
							| 
									
										
										
										
											2008-05-20 15:24:20 +00:00
										 |  |  | #include "../helpers/count.hpp"
 | 
					
						
							| 
									
										
										
										
											2008-06-21 22:02:15 +00:00
										 |  |  | #include "../helpers/memory.hpp"
 | 
					
						
							| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | namespace test | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     // Note that the default hash function will work for any equal_to (but not
 | 
					
						
							|  |  |  |     // very well).
 | 
					
						
							|  |  |  |     class object; | 
					
						
							| 
									
										
										
										
											2011-03-16 21:34:08 +00:00
										 |  |  |     class implicitly_convertible; | 
					
						
							| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  |     class hash; | 
					
						
							|  |  |  |     class less; | 
					
						
							|  |  |  |     class equal_to; | 
					
						
							| 
									
										
										
										
											2012-07-08 11:55:35 +00:00
										 |  |  |     template <class T> class allocator1; | 
					
						
							|  |  |  |     template <class T> class allocator2; | 
					
						
							| 
									
										
										
										
											2008-01-20 18:55:57 +00:00
										 |  |  |     object generate(object const*); | 
					
						
							| 
									
										
										
										
											2011-03-16 21:34:08 +00:00
										 |  |  |     implicitly_convertible generate(implicitly_convertible const*); | 
					
						
							| 
									
										
										
										
											2011-08-11 21:18:43 +00:00
										 |  |  |      | 
					
						
							| 
									
										
										
										
											2012-07-08 11:54:47 +00:00
										 |  |  |     class object : private counted_object | 
					
						
							| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  |     { | 
					
						
							|  |  |  |         friend class hash; | 
					
						
							|  |  |  |         friend class equal_to; | 
					
						
							|  |  |  |         friend class less; | 
					
						
							|  |  |  |         int tag1_, tag2_; | 
					
						
							|  |  |  |     public: | 
					
						
							|  |  |  |         explicit object(int t1 = 0, int t2 = 0) : tag1_(t1), tag2_(t2) {} | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2006-10-31 22:19:26 +00:00
										 |  |  |         ~object() { | 
					
						
							|  |  |  |             tag1_ = -1; | 
					
						
							|  |  |  |             tag2_ = -1; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  |         friend bool operator==(object const& x1, object const& x2) { | 
					
						
							|  |  |  |             return x1.tag1_ == x2.tag1_ && x1.tag2_ == x2.tag2_; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         friend bool operator!=(object const& x1, object const& x2) { | 
					
						
							|  |  |  |             return x1.tag1_ != x2.tag1_ || x1.tag2_ != x2.tag2_; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         friend bool operator<(object const& x1, object const& x2) { | 
					
						
							|  |  |  |             return x1.tag1_ < x2.tag1_ || | 
					
						
							|  |  |  |                 (x1.tag1_ == x2.tag1_ && x1.tag2_ < x2.tag2_); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         friend object generate(object const*) { | 
					
						
							| 
									
										
										
										
											2006-06-12 23:30:46 +00:00
										 |  |  |             int* x = 0; | 
					
						
							| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  |             return object(generate(x), generate(x)); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         friend std::ostream& operator<<(std::ostream& out, object const& o) | 
					
						
							|  |  |  |         { | 
					
						
							|  |  |  |             return out<<"("<<o.tag1_<<","<<o.tag2_<<")"; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |     }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-07-08 11:54:47 +00:00
										 |  |  |     class implicitly_convertible : private counted_object | 
					
						
							| 
									
										
										
										
											2011-03-16 21:34:08 +00:00
										 |  |  |     { | 
					
						
							|  |  |  |         int tag1_, tag2_; | 
					
						
							|  |  |  |     public: | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         explicit implicitly_convertible(int t1 = 0, int t2 = 0) | 
					
						
							|  |  |  |             : tag1_(t1), tag2_(t2) | 
					
						
							|  |  |  |             {} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         operator object() const | 
					
						
							|  |  |  |         { | 
					
						
							|  |  |  |             return object(tag1_, tag2_); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         friend implicitly_convertible generate(implicitly_convertible const*) { | 
					
						
							|  |  |  |             int* x = 0; | 
					
						
							|  |  |  |             return implicitly_convertible(generate(x), generate(x)); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         friend std::ostream& operator<<(std::ostream& out, implicitly_convertible const& o) | 
					
						
							|  |  |  |         { | 
					
						
							|  |  |  |             return out<<"("<<o.tag1_<<","<<o.tag2_<<")"; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |     }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  |     class hash | 
					
						
							|  |  |  |     { | 
					
						
							|  |  |  |         int type_; | 
					
						
							|  |  |  |     public: | 
					
						
							|  |  |  |         explicit hash(int t = 0) : type_(t) {} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         std::size_t operator()(object const& x) const { | 
					
						
							|  |  |  |             switch(type_) { | 
					
						
							|  |  |  |             case 1: | 
					
						
							|  |  |  |                 return x.tag1_; | 
					
						
							|  |  |  |             case 2: | 
					
						
							|  |  |  |                 return x.tag2_; | 
					
						
							|  |  |  |             default: | 
					
						
							|  |  |  |                 return x.tag1_ + x.tag2_;  | 
					
						
							|  |  |  |             } | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         std::size_t operator()(int x) const { | 
					
						
							|  |  |  |             return x; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         friend bool operator==(hash const& x1, hash const& x2) { | 
					
						
							|  |  |  |             return x1.type_ == x2.type_; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         friend bool operator!=(hash const& x1, hash const& x2) { | 
					
						
							|  |  |  |             return x1.type_ != x2.type_; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |     }; | 
					
						
							| 
									
										
										
										
											2009-09-27 19:12:04 +00:00
										 |  |  |      | 
					
						
							|  |  |  |     std::size_t hash_value(test::object const& x) { | 
					
						
							|  |  |  |         return hash()(x); | 
					
						
							|  |  |  |     } | 
					
						
							| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     class less | 
					
						
							|  |  |  |     { | 
					
						
							|  |  |  |         int type_; | 
					
						
							|  |  |  |     public: | 
					
						
							|  |  |  |         explicit less(int t = 0) : type_(t) {} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         bool operator()(object const& x1, object const& x2) const { | 
					
						
							|  |  |  |             switch(type_) { | 
					
						
							|  |  |  |             case 1: | 
					
						
							|  |  |  |                 return x1.tag1_ < x2.tag1_; | 
					
						
							|  |  |  |             case 2: | 
					
						
							|  |  |  |                 return x1.tag2_ < x2.tag2_; | 
					
						
							|  |  |  |             default: | 
					
						
							|  |  |  |                 return x1 < x2; | 
					
						
							|  |  |  |             } | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         std::size_t operator()(int x1, int x2) const { | 
					
						
							|  |  |  |             return x1 < x2; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         friend bool operator==(less const& x1, less const& x2) { | 
					
						
							|  |  |  |             return x1.type_ == x2.type_; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |     }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     class equal_to | 
					
						
							|  |  |  |     { | 
					
						
							|  |  |  |         int type_; | 
					
						
							|  |  |  |     public: | 
					
						
							|  |  |  |         explicit equal_to(int t = 0) : type_(t) {} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         bool operator()(object const& x1, object const& x2) const { | 
					
						
							|  |  |  |             switch(type_) { | 
					
						
							|  |  |  |             case 1: | 
					
						
							|  |  |  |                 return x1.tag1_ == x2.tag1_; | 
					
						
							|  |  |  |             case 2: | 
					
						
							|  |  |  |                 return x1.tag2_ == x2.tag2_; | 
					
						
							|  |  |  |             default: | 
					
						
							|  |  |  |                 return x1 == x2; | 
					
						
							|  |  |  |             } | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         std::size_t operator()(int x1, int x2) const { | 
					
						
							|  |  |  |             return x1 == x2; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         friend bool operator==(equal_to const& x1, equal_to const& x2) { | 
					
						
							|  |  |  |             return x1.type_ == x2.type_; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         friend bool operator!=(equal_to const& x1, equal_to const& x2) { | 
					
						
							|  |  |  |             return x1.type_ != x2.type_; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         friend less create_compare(equal_to x) { | 
					
						
							|  |  |  |             return less(x.type_); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |     }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-07-08 11:55:35 +00:00
										 |  |  |     // allocator1 and allocator2 are pretty similar.
 | 
					
						
							|  |  |  |     // allocator1 only has the old fashioned 'construct' method and has
 | 
					
						
							|  |  |  |     // a few less typedefs
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  |     template <class T> | 
					
						
							| 
									
										
										
										
											2012-07-08 11:55:35 +00:00
										 |  |  |     class allocator1 | 
					
						
							|  |  |  |     { | 
					
						
							|  |  |  |     public: | 
					
						
							|  |  |  |         int tag_; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         typedef T value_type; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         template <class U> struct rebind { typedef allocator1<U> other; }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         explicit allocator1(int t = 0) : tag_(t) | 
					
						
							|  |  |  |         { | 
					
						
							|  |  |  |             detail::tracker.allocator_ref(); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         template <class Y> allocator1(allocator1<Y> const& x) | 
					
						
							|  |  |  |             : tag_(x.tag_) | 
					
						
							|  |  |  |         { | 
					
						
							|  |  |  |             detail::tracker.allocator_ref(); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         allocator1(allocator1 const& x) | 
					
						
							|  |  |  |             : tag_(x.tag_) | 
					
						
							|  |  |  |         { | 
					
						
							|  |  |  |             detail::tracker.allocator_ref(); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         ~allocator1() | 
					
						
							|  |  |  |         { | 
					
						
							|  |  |  |             detail::tracker.allocator_unref(); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         T* allocate(std::size_t n) { | 
					
						
							|  |  |  |             T* ptr(static_cast<T*>(::operator new(n * sizeof(T)))); | 
					
						
							|  |  |  |             detail::tracker.track_allocate((void*) ptr, n, sizeof(T), tag_); | 
					
						
							|  |  |  |             return ptr; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         T* allocate(std::size_t n, void const* u) | 
					
						
							|  |  |  |         { | 
					
						
							|  |  |  |             T* ptr(static_cast<T*>(::operator new(n * sizeof(T)))); | 
					
						
							|  |  |  |             detail::tracker.track_allocate((void*) ptr, n, sizeof(T), tag_); | 
					
						
							|  |  |  |             return ptr; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         void deallocate(T* p, std::size_t n) | 
					
						
							|  |  |  |         { | 
					
						
							|  |  |  |             detail::tracker.track_deallocate((void*) p, n, sizeof(T), tag_); | 
					
						
							|  |  |  |             ::operator delete((void*) p); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         void construct(T* p, T const& t) { | 
					
						
							|  |  |  |             // Don't count constructions here as it isn't always called.
 | 
					
						
							|  |  |  |             //detail::tracker.track_construct((void*) p, sizeof(T), tag_);
 | 
					
						
							|  |  |  |             new(p) T(t); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         void destroy(T* p) { | 
					
						
							|  |  |  |             //detail::tracker.track_destroy((void*) p, sizeof(T), tag_);
 | 
					
						
							|  |  |  |             p->~T(); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         bool operator==(allocator1 const& x) const | 
					
						
							|  |  |  |         { | 
					
						
							|  |  |  |             return tag_ == x.tag_; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         bool operator!=(allocator1 const& x) const | 
					
						
							|  |  |  |         { | 
					
						
							|  |  |  |             return tag_ != x.tag_; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         enum { | 
					
						
							|  |  |  |             is_select_on_copy = false, | 
					
						
							|  |  |  |             is_propagate_on_swap = false, | 
					
						
							|  |  |  |             is_propagate_on_assign = false, | 
					
						
							|  |  |  |             is_propagate_on_move = false | 
					
						
							|  |  |  |         }; | 
					
						
							|  |  |  |     }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     template <class T> | 
					
						
							|  |  |  |     class allocator2 | 
					
						
							| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  |     { | 
					
						
							| 
									
										
										
										
											2006-05-21 17:14:11 +00:00
										 |  |  | # ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
 | 
					
						
							|  |  |  |     public: | 
					
						
							|  |  |  | # else
 | 
					
						
							| 
									
										
										
										
											2012-07-08 11:55:35 +00:00
										 |  |  |         template <class> friend class allocator2; | 
					
						
							| 
									
										
										
										
											2006-05-21 17:14:11 +00:00
										 |  |  | # endif
 | 
					
						
							|  |  |  |         int tag_; | 
					
						
							| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  |     public: | 
					
						
							|  |  |  |         typedef std::size_t size_type; | 
					
						
							|  |  |  |         typedef std::ptrdiff_t difference_type; | 
					
						
							|  |  |  |         typedef T* pointer; | 
					
						
							|  |  |  |         typedef T const* const_pointer; | 
					
						
							|  |  |  |         typedef T& reference; | 
					
						
							|  |  |  |         typedef T const& const_reference; | 
					
						
							|  |  |  |         typedef T value_type; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-07-08 11:55:35 +00:00
										 |  |  |         template <class U> struct rebind { typedef allocator2<U> other; }; | 
					
						
							| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-07-08 11:55:35 +00:00
										 |  |  |         explicit allocator2(int t = 0) : tag_(t) | 
					
						
							| 
									
										
										
										
											2010-01-04 22:49:39 +00:00
										 |  |  |         { | 
					
						
							|  |  |  |             detail::tracker.allocator_ref(); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |          | 
					
						
							| 
									
										
										
										
											2012-07-08 11:55:35 +00:00
										 |  |  |         template <class Y> allocator2(allocator2<Y> const& x) | 
					
						
							| 
									
										
										
										
											2010-01-04 22:49:39 +00:00
										 |  |  |             : tag_(x.tag_) | 
					
						
							|  |  |  |         { | 
					
						
							|  |  |  |             detail::tracker.allocator_ref(); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-07-08 11:55:35 +00:00
										 |  |  |         allocator2(allocator2 const& x) | 
					
						
							| 
									
										
										
										
											2010-01-04 22:49:39 +00:00
										 |  |  |             : tag_(x.tag_) | 
					
						
							|  |  |  |         { | 
					
						
							|  |  |  |             detail::tracker.allocator_ref(); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-07-08 11:55:35 +00:00
										 |  |  |         ~allocator2() | 
					
						
							| 
									
										
										
										
											2010-01-04 22:49:39 +00:00
										 |  |  |         { | 
					
						
							|  |  |  |             detail::tracker.allocator_unref(); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         pointer address(reference r) | 
					
						
							|  |  |  |         { | 
					
						
							|  |  |  |             return pointer(&r); | 
					
						
							|  |  |  |         } | 
					
						
							| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-01-04 22:49:39 +00:00
										 |  |  |         const_pointer address(const_reference r) | 
					
						
							|  |  |  |         { | 
					
						
							|  |  |  |             return const_pointer(&r); | 
					
						
							|  |  |  |         } | 
					
						
							| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         pointer allocate(size_type n) { | 
					
						
							| 
									
										
										
										
											2006-06-11 19:42:55 +00:00
										 |  |  |             pointer ptr(static_cast<T*>(::operator new(n * sizeof(T)))); | 
					
						
							| 
									
										
										
										
											2008-01-10 22:30:46 +00:00
										 |  |  |             detail::tracker.track_allocate((void*) ptr, n, sizeof(T), tag_); | 
					
						
							| 
									
										
										
										
											2006-06-11 19:42:55 +00:00
										 |  |  |             return ptr; | 
					
						
							| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 42882-42941 via svnmerge from 
https://svn.boost.org/svn/boost/branches/unordered/trunk
................
  r42887 | danieljames | 2008-01-20 21:32:04 +0000 (Sun, 20 Jan 2008) | 10 lines
  
  Merged revisions 42590-42664,42667-42697,42699-42723,42725-42855,42857-42881 via svnmerge from 
  https://svn.boost.org/svn/boost/trunk
  
  ........
    r42881 | danieljames | 2008-01-20 17:37:21 +0000 (Sun, 20 Jan 2008) | 1 line
    
    Include <new> to get std::bad_alloc.
  ........
................
  r42892 | danieljames | 2008-01-21 13:03:16 +0000 (Mon, 21 Jan 2008) | 1 line
  
  On some compilers the Rogue Wave/Apache stdcxx library doesn't have the normal std::distance, but instead has a variant that takes the result as the third parameter so it doesn't have to work out the type from the iterator.
................
  r42893 | danieljames | 2008-01-21 13:07:58 +0000 (Mon, 21 Jan 2008) | 1 line
  
  Fix a typo in the last commit.
................
  r42895 | danieljames | 2008-01-21 13:33:29 +0000 (Mon, 21 Jan 2008) | 1 line
  
  Remove tabs from the last checkin.
................
  r42896 | danieljames | 2008-01-21 15:51:40 +0000 (Mon, 21 Jan 2008) | 1 line
  
  Use Boost config to tell when we have a std::distance function. Also, no need for a macro.
................
  r42908 | danieljames | 2008-01-21 21:37:04 +0000 (Mon, 21 Jan 2008) | 1 line
  
  Use boost::long_long_type and boost::ulong_long_type.
................
  r42921 | danieljames | 2008-01-23 11:43:35 +0000 (Wed, 23 Jan 2008) | 1 line
  
  Remove some tabs.
................
  r42922 | danieljames | 2008-01-23 11:46:28 +0000 (Wed, 23 Jan 2008) | 2 lines
  
  Add missing include. Refs #1596
................
  r42923 | danieljames | 2008-01-23 11:52:47 +0000 (Wed, 23 Jan 2008) | 2 lines
  
  Always use void const* for the second parameter of allocate. Refs #1596.
................
  r42936 | danieljames | 2008-01-23 22:22:16 +0000 (Wed, 23 Jan 2008) | 1 line
  
  Use Boost style library name in the documentation.
................
  r42937 | danieljames | 2008-01-23 22:22:32 +0000 (Wed, 23 Jan 2008) | 1 line
  
  More tabs.
................
  r42941 | danieljames | 2008-01-23 23:35:01 +0000 (Wed, 23 Jan 2008) | 1 line
  
  Fix all the allocators.
................
[SVN r42943]
											
										 
											2008-01-23 23:39:59 +00:00
										 |  |  |         pointer allocate(size_type n, void const* u) | 
					
						
							| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  |         { | 
					
						
							| 
									
										
										
										
											2006-06-11 19:42:55 +00:00
										 |  |  |             pointer ptr(static_cast<T*>(::operator new(n * sizeof(T)))); | 
					
						
							| 
									
										
										
										
											2008-01-10 22:30:46 +00:00
										 |  |  |             detail::tracker.track_allocate((void*) ptr, n, sizeof(T), tag_); | 
					
						
							| 
									
										
										
										
											2006-06-11 19:42:55 +00:00
										 |  |  |             return ptr; | 
					
						
							| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         void deallocate(pointer p, size_type n) | 
					
						
							|  |  |  |         { | 
					
						
							| 
									
										
										
										
											2008-01-10 22:30:46 +00:00
										 |  |  |             detail::tracker.track_deallocate((void*) p, n, sizeof(T), tag_); | 
					
						
							| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  |             ::operator delete((void*) p); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-08-11 21:18:43 +00:00
										 |  |  |         void construct(T* p, T const& t) { | 
					
						
							| 
									
										
										
										
											2008-01-10 22:30:46 +00:00
										 |  |  |             detail::tracker.track_construct((void*) p, sizeof(T), tag_); | 
					
						
							| 
									
										
										
										
											2006-06-11 19:42:55 +00:00
										 |  |  |             new(p) T(t); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-06-28 20:58:56 +00:00
										 |  |  | #if !defined(BOOST_NO_VARIADIC_TEMPLATES)
 | 
					
						
							|  |  |  |         template<class... Args> void construct(T* p, BOOST_FWD_REF(Args)... args) { | 
					
						
							| 
									
										
											  
											
												Merge support for emplace for compilers with rvalue references and variadic templates arguments, and better use of C++0x allocators.
Merged revisions 44058-44075,44078-44084,44086-44108,44110-44365,44367,44369-44414,44416-44419,44421-44457,44467-44469,44471-44511,44513-44535,44537-44737 via svnmerge from 
https://svn.boost.org/svn/boost/branches/unordered/trunk
................
  r44467 | danieljames | 2008-04-16 18:35:56 +0100 (Wed, 16 Apr 2008) | 2 lines
  
  Add C++-0x support to the test allocators.
................
  r44468 | danieljames | 2008-04-16 18:36:06 +0100 (Wed, 16 Apr 2008) | 2 lines
  
  Add a C++-0x node_constructor.
................
  r44469 | danieljames | 2008-04-16 18:36:16 +0100 (Wed, 16 Apr 2008) | 2 lines
  
  C++-0x constructor for node.
................
  r44516 | danieljames | 2008-04-17 21:41:48 +0100 (Thu, 17 Apr 2008) | 16 lines
  
  Merge in my work so far on implementing emplace for compilers with variadic
  template & rvalue references.
  
  Merged revisions 44059-44062 via svnmerge from 
  https://svn.boost.org/svn/boost/branches/unordered/dev
  
  ........
    r44059 | danieljames | 2008-04-05 17:41:25 +0100 (Sat, 05 Apr 2008) | 1 line
    
    First stab at implementing emplace - only for compilers with variadic template & rvalue references.
  ........
    r44062 | danieljames | 2008-04-05 19:12:09 +0100 (Sat, 05 Apr 2008) | 1 line
    
    Better variable template arguments, need to add proper support to BoostBook.
  ........
................
  r44616 | danieljames | 2008-04-20 13:30:19 +0100 (Sun, 20 Apr 2008) | 1 line
  
  Merge with trunk, fixes tabs.
................
  r44618 | danieljames | 2008-04-20 13:42:38 +0100 (Sun, 20 Apr 2008) | 2 lines
  
  Some extra compile tests.
................
  r44619 | danieljames | 2008-04-20 13:42:50 +0100 (Sun, 20 Apr 2008) | 2 lines
  
  Fix an error message.
................
  r44703 | danieljames | 2008-04-21 20:19:50 +0100 (Mon, 21 Apr 2008) | 15 lines
  
  Merge latest changes from trunk.
  
  Merged revisions 44616-44702 via svnmerge from 
  https://svn.boost.org/svn/boost/trunk
  
  ........
    r44650 | danieljames | 2008-04-20 22:08:57 +0100 (Sun, 20 Apr 2008) | 1 line
    
    Update an include.
  ........
    r44697 | danieljames | 2008-04-21 16:55:40 +0100 (Mon, 21 Apr 2008) | 1 line
    
    Factor out the code for choosing the bucket count, and which bucket that hash values map to make it easier to experiment with alternative policies.
  ........
................
  r44733 | danieljames | 2008-04-23 07:55:43 +0100 (Wed, 23 Apr 2008) | 2 lines
  
  Remove 'reserve_extra'.
................
  r44734 | danieljames | 2008-04-23 07:55:55 +0100 (Wed, 23 Apr 2008) | 2 lines
  
  More unnecessary copy tests - showing some weakness in the emplace implementation.
................
  r44735 | danieljames | 2008-04-23 07:56:06 +0100 (Wed, 23 Apr 2008) | 2 lines
  
  More tests.
................
  r44736 | danieljames | 2008-04-23 07:56:19 +0100 (Wed, 23 Apr 2008) | 2 lines
  
  Comment out a test which requires a C++0x std::pair.
................
  r44737 | danieljames | 2008-04-23 07:56:35 +0100 (Wed, 23 Apr 2008) | 2 lines
  
  Avoid creating unnecessary copies in unordered_set::emplace and unordered_map::emplace.
................
[SVN r44738]
											
										 
											2008-04-23 07:09:58 +00:00
										 |  |  |             detail::tracker.track_construct((void*) p, sizeof(T), tag_); | 
					
						
							| 
									
										
										
										
											2012-01-06 08:36:43 +00:00
										 |  |  |             new(p) T(boost::forward<Args>(args)...); | 
					
						
							| 
									
										
											  
											
												Merge support for emplace for compilers with rvalue references and variadic templates arguments, and better use of C++0x allocators.
Merged revisions 44058-44075,44078-44084,44086-44108,44110-44365,44367,44369-44414,44416-44419,44421-44457,44467-44469,44471-44511,44513-44535,44537-44737 via svnmerge from 
https://svn.boost.org/svn/boost/branches/unordered/trunk
................
  r44467 | danieljames | 2008-04-16 18:35:56 +0100 (Wed, 16 Apr 2008) | 2 lines
  
  Add C++-0x support to the test allocators.
................
  r44468 | danieljames | 2008-04-16 18:36:06 +0100 (Wed, 16 Apr 2008) | 2 lines
  
  Add a C++-0x node_constructor.
................
  r44469 | danieljames | 2008-04-16 18:36:16 +0100 (Wed, 16 Apr 2008) | 2 lines
  
  C++-0x constructor for node.
................
  r44516 | danieljames | 2008-04-17 21:41:48 +0100 (Thu, 17 Apr 2008) | 16 lines
  
  Merge in my work so far on implementing emplace for compilers with variadic
  template & rvalue references.
  
  Merged revisions 44059-44062 via svnmerge from 
  https://svn.boost.org/svn/boost/branches/unordered/dev
  
  ........
    r44059 | danieljames | 2008-04-05 17:41:25 +0100 (Sat, 05 Apr 2008) | 1 line
    
    First stab at implementing emplace - only for compilers with variadic template & rvalue references.
  ........
    r44062 | danieljames | 2008-04-05 19:12:09 +0100 (Sat, 05 Apr 2008) | 1 line
    
    Better variable template arguments, need to add proper support to BoostBook.
  ........
................
  r44616 | danieljames | 2008-04-20 13:30:19 +0100 (Sun, 20 Apr 2008) | 1 line
  
  Merge with trunk, fixes tabs.
................
  r44618 | danieljames | 2008-04-20 13:42:38 +0100 (Sun, 20 Apr 2008) | 2 lines
  
  Some extra compile tests.
................
  r44619 | danieljames | 2008-04-20 13:42:50 +0100 (Sun, 20 Apr 2008) | 2 lines
  
  Fix an error message.
................
  r44703 | danieljames | 2008-04-21 20:19:50 +0100 (Mon, 21 Apr 2008) | 15 lines
  
  Merge latest changes from trunk.
  
  Merged revisions 44616-44702 via svnmerge from 
  https://svn.boost.org/svn/boost/trunk
  
  ........
    r44650 | danieljames | 2008-04-20 22:08:57 +0100 (Sun, 20 Apr 2008) | 1 line
    
    Update an include.
  ........
    r44697 | danieljames | 2008-04-21 16:55:40 +0100 (Mon, 21 Apr 2008) | 1 line
    
    Factor out the code for choosing the bucket count, and which bucket that hash values map to make it easier to experiment with alternative policies.
  ........
................
  r44733 | danieljames | 2008-04-23 07:55:43 +0100 (Wed, 23 Apr 2008) | 2 lines
  
  Remove 'reserve_extra'.
................
  r44734 | danieljames | 2008-04-23 07:55:55 +0100 (Wed, 23 Apr 2008) | 2 lines
  
  More unnecessary copy tests - showing some weakness in the emplace implementation.
................
  r44735 | danieljames | 2008-04-23 07:56:06 +0100 (Wed, 23 Apr 2008) | 2 lines
  
  More tests.
................
  r44736 | danieljames | 2008-04-23 07:56:19 +0100 (Wed, 23 Apr 2008) | 2 lines
  
  Comment out a test which requires a C++0x std::pair.
................
  r44737 | danieljames | 2008-04-23 07:56:35 +0100 (Wed, 23 Apr 2008) | 2 lines
  
  Avoid creating unnecessary copies in unordered_set::emplace and unordered_map::emplace.
................
[SVN r44738]
											
										 
											2008-04-23 07:09:58 +00:00
										 |  |  |         } | 
					
						
							|  |  |  | #endif
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-08-11 21:18:43 +00:00
										 |  |  |         void destroy(T* p) { | 
					
						
							| 
									
										
										
										
											2008-01-10 22:30:46 +00:00
										 |  |  |             detail::tracker.track_destroy((void*) p, sizeof(T), tag_); | 
					
						
							| 
									
										
										
										
											2006-06-11 19:42:55 +00:00
										 |  |  |             p->~T(); | 
					
						
							|  |  |  |         } | 
					
						
							| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2006-05-21 17:14:11 +00:00
										 |  |  |         size_type max_size() const { | 
					
						
							|  |  |  |             return (std::numeric_limits<size_type>::max)(); | 
					
						
							|  |  |  |         } | 
					
						
							| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-07-08 11:55:35 +00:00
										 |  |  |         bool operator==(allocator2 const& x) const | 
					
						
							| 
									
										
										
										
											2006-06-18 13:24:38 +00:00
										 |  |  |         { | 
					
						
							|  |  |  |             return tag_ == x.tag_; | 
					
						
							|  |  |  |         } | 
					
						
							| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-07-08 11:55:35 +00:00
										 |  |  |         bool operator!=(allocator2 const& x) const | 
					
						
							| 
									
										
										
										
											2006-05-21 17:14:11 +00:00
										 |  |  |         { | 
					
						
							| 
									
										
										
										
											2006-06-18 13:24:38 +00:00
										 |  |  |             return tag_ != x.tag_; | 
					
						
							| 
									
										
										
										
											2006-05-21 17:14:11 +00:00
										 |  |  |         } | 
					
						
							| 
									
										
										
										
											2011-08-15 20:23:29 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         enum { | 
					
						
							|  |  |  |             is_select_on_copy = false, | 
					
						
							|  |  |  |             is_propagate_on_swap = false, | 
					
						
							|  |  |  |             is_propagate_on_assign = false, | 
					
						
							|  |  |  |             is_propagate_on_move = false | 
					
						
							|  |  |  |         }; | 
					
						
							| 
									
										
										
										
											2006-05-21 17:14:11 +00:00
										 |  |  |     }; | 
					
						
							| 
									
										
										
										
											2006-12-03 23:08:17 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2006-06-12 23:30:46 +00:00
										 |  |  |     template <class T> | 
					
						
							| 
									
										
										
										
											2012-07-08 11:55:35 +00:00
										 |  |  |     bool equivalent_impl(allocator1<T> const& x, allocator1<T> const& y, | 
					
						
							|  |  |  |         test::derived_type) | 
					
						
							|  |  |  |     { | 
					
						
							|  |  |  |         return x == y; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     template <class T> | 
					
						
							|  |  |  |     bool equivalent_impl(allocator2<T> const& x, allocator2<T> const& y, | 
					
						
							| 
									
										
										
										
											2010-01-04 22:49:39 +00:00
										 |  |  |         test::derived_type) | 
					
						
							|  |  |  |     { | 
					
						
							| 
									
										
										
										
											2006-06-18 13:24:38 +00:00
										 |  |  |         return x == y; | 
					
						
							| 
									
										
										
										
											2006-06-12 23:30:46 +00:00
										 |  |  |     } | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2006-05-17 17:19:16 +00:00
										 |  |  | #endif
 |