diff options
Diffstat (limited to 'libs/container/test/dummy_test_allocator.hpp')
| -rw-r--r-- | libs/container/test/dummy_test_allocator.hpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libs/container/test/dummy_test_allocator.hpp b/libs/container/test/dummy_test_allocator.hpp index 719d0ca5a3..dd0d8726e2 100644 --- a/libs/container/test/dummy_test_allocator.hpp +++ b/libs/container/test/dummy_test_allocator.hpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // -// (C) Copyright Ion Gaztanaga 2005-2011. Distributed under the Boost +// (C) Copyright Ion Gaztanaga 2005-2012. 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) // @@ -69,7 +69,7 @@ class simple_allocator //Version 2 allocator with rebind template<class T> -class dummy_test_allocator +class dummy_test_allocator { private: typedef dummy_test_allocator<T> self_t; @@ -100,7 +100,7 @@ class dummy_test_allocator //!Default constructor. Never throws dummy_test_allocator() - {} + {} //!Constructor from other dummy_test_allocator. Never throws dummy_test_allocator(const dummy_test_allocator &) @@ -112,10 +112,10 @@ class dummy_test_allocator {} pointer address(reference value) - { return pointer(addressof(value)); } + { return pointer(container_detail::addressof(value)); } const_pointer address(const_reference value) const - { return const_pointer(addressof(value)); } + { return const_pointer(container_detail::addressof(value)); } pointer allocate(size_type, cvoid_ptr = 0) { return 0; } @@ -140,7 +140,7 @@ class dummy_test_allocator std::pair<pointer, bool> allocation_command(boost::container::allocation_type, - size_type, + size_type, size_type, size_type &, const pointer & = 0) { return std::pair<pointer, bool>(pointer(), true); } @@ -192,19 +192,19 @@ class dummy_test_allocator //!Equality test for same type of dummy_test_allocator template<class T> inline -bool operator==(const dummy_test_allocator<T> &, +bool operator==(const dummy_test_allocator<T> &, const dummy_test_allocator<T> &) { return true; } //!Inequality test for same type of dummy_test_allocator template<class T> inline -bool operator!=(const dummy_test_allocator<T> &, +bool operator!=(const dummy_test_allocator<T> &, const dummy_test_allocator<T> &) { return false; } template< class T - , bool PropagateOnContCopyAssign + , bool PropagateOnContCopyAssign , bool PropagateOnContMoveAssign , bool PropagateOnContSwap , bool CopyOnPropagateOnContSwap @@ -335,7 +335,7 @@ class propagation_test_allocator }; template< class T - , bool PropagateOnContCopyAssign + , bool PropagateOnContCopyAssign , bool PropagateOnContMoveAssign , bool PropagateOnContSwap , bool CopyOnPropagateOnContSwap |