2006-05-21 17:14:11 +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-21 17:14:11 +00:00
|
|
|
|
2008-01-13 16:19:26 +00:00
|
|
|
#if !defined(BOOST_UNORDERED_EXCEPTION_TEST_OBJECTS_HEADER)
|
|
|
|
#define BOOST_UNORDERED_EXCEPTION_TEST_OBJECTS_HEADER
|
|
|
|
|
|
|
|
#include "../helpers/exception_test.hpp"
|
2008-01-12 14:43:40 +00:00
|
|
|
|
2006-05-21 17:14:11 +00:00
|
|
|
#include <cstddef>
|
2008-01-12 14:43:40 +00:00
|
|
|
#include <iostream>
|
2006-05-21 17:14:11 +00:00
|
|
|
#include <boost/limits.hpp>
|
2008-01-20 17:37:21 +00:00
|
|
|
#include <new>
|
2006-05-21 17:14:11 +00:00
|
|
|
#include "../helpers/fwd.hpp"
|
2008-06-21 22:02:15 +00:00
|
|
|
#include "../helpers/memory.hpp"
|
2006-05-21 17:14:11 +00:00
|
|
|
|
|
|
|
namespace test
|
|
|
|
{
|
|
|
|
namespace exception
|
|
|
|
{
|
|
|
|
class object;
|
|
|
|
class hash;
|
|
|
|
class equal_to;
|
|
|
|
template <class T> class allocator;
|
2008-01-20 18:55:57 +00:00
|
|
|
object generate(object const*);
|
2006-05-21 17:14:11 +00:00
|
|
|
|
2011-08-11 21:18:43 +00:00
|
|
|
struct true_type
|
|
|
|
{
|
|
|
|
enum { value = true };
|
|
|
|
};
|
|
|
|
|
|
|
|
struct false_type
|
|
|
|
{
|
|
|
|
enum { value = false };
|
|
|
|
};
|
|
|
|
|
2006-05-21 17:14:11 +00:00
|
|
|
class object
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
int tag1_, tag2_;
|
|
|
|
|
|
|
|
explicit object() : tag1_(0), tag2_(0)
|
|
|
|
{
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(object::object()) {
|
|
|
|
UNORDERED_EPOINT("Mock object default constructor.");
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
explicit object(int t1, int t2 = 0) : tag1_(t1), tag2_(t2)
|
|
|
|
{
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(object::object(int)) {
|
|
|
|
UNORDERED_EPOINT("Mock object constructor by value.");
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
object(object const& x)
|
|
|
|
: tag1_(x.tag1_), tag2_(x.tag2_)
|
|
|
|
{
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(object::object(object)) {
|
|
|
|
UNORDERED_EPOINT("Mock object copy constructor.");
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-10-31 22:19:26 +00:00
|
|
|
~object() {
|
|
|
|
tag1_ = -1;
|
|
|
|
tag2_ = -1;
|
|
|
|
}
|
|
|
|
|
2006-05-21 17:14:11 +00:00
|
|
|
object& operator=(object const& x)
|
|
|
|
{
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(object::operator=(object)) {
|
2006-05-21 17:14:11 +00:00
|
|
|
tag1_ = x.tag1_;
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_EPOINT("Mock object assign operator 1.");
|
2006-05-21 17:14:11 +00:00
|
|
|
tag2_ = x.tag2_;
|
2008-01-13 16:19:26 +00:00
|
|
|
//UNORDERED_EPOINT("Mock object assign operator 2.");
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
friend bool operator==(object const& x1, object const& x2) {
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(operator==(object, object)) {
|
|
|
|
UNORDERED_EPOINT("Mock object equality operator.");
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return x1.tag1_ == x2.tag1_ && x1.tag2_ == x2.tag2_;
|
|
|
|
}
|
|
|
|
|
|
|
|
friend bool operator!=(object const& x1, object const& x2) {
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(operator!=(object, object)) {
|
|
|
|
UNORDERED_EPOINT("Mock object inequality operator.");
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return !(x1.tag1_ == x2.tag1_ && x1.tag2_ == x2.tag2_);
|
|
|
|
}
|
|
|
|
|
|
|
|
// None of the last few functions are used by the unordered associative
|
|
|
|
// containers - so there aren't any exception points.
|
|
|
|
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*) {
|
|
|
|
int* x = 0;
|
|
|
|
return object(::test::generate(x), ::test::generate(x));
|
|
|
|
}
|
|
|
|
|
|
|
|
friend std::ostream& operator<<(std::ostream& out, object const& o)
|
|
|
|
{
|
|
|
|
return out<<"("<<o.tag1_<<","<<o.tag2_<<")";
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
class hash
|
|
|
|
{
|
|
|
|
int tag_;
|
|
|
|
public:
|
|
|
|
hash(int t = 0) : tag_(t)
|
|
|
|
{
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(hash::object()) {
|
|
|
|
UNORDERED_EPOINT("Mock hash default constructor.");
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
hash(hash const& x)
|
|
|
|
: tag_(x.tag_)
|
|
|
|
{
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(hash::hash(hash)) {
|
|
|
|
UNORDERED_EPOINT("Mock hash copy constructor.");
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
hash& operator=(hash const& x)
|
|
|
|
{
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(hash::operator=(hash)) {
|
|
|
|
UNORDERED_EPOINT("Mock hash assign operator 1.");
|
2006-05-21 17:14:11 +00:00
|
|
|
tag_ = x.tag_;
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_EPOINT("Mock hash assign operator 2.");
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
std::size_t operator()(object const& x) const {
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(hash::operator()(object)) {
|
|
|
|
UNORDERED_EPOINT("Mock hash function.");
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
switch(tag_) {
|
|
|
|
case 1:
|
|
|
|
return x.tag1_;
|
|
|
|
case 2:
|
|
|
|
return x.tag2_;
|
|
|
|
default:
|
|
|
|
return x.tag1_ + x.tag2_;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
friend bool operator==(hash const& x1, hash const& x2) {
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(operator==(hash, hash)) {
|
|
|
|
UNORDERED_EPOINT("Mock hash equality function.");
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
return x1.tag_ == x2.tag_;
|
|
|
|
}
|
|
|
|
|
|
|
|
friend bool operator!=(hash const& x1, hash const& x2) {
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(hash::operator!=(hash, hash)) {
|
|
|
|
UNORDERED_EPOINT("Mock hash inequality function.");
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
return x1.tag_ != x2.tag_;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
class equal_to
|
|
|
|
{
|
|
|
|
int tag_;
|
|
|
|
public:
|
|
|
|
equal_to(int t = 0) : tag_(t)
|
|
|
|
{
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(equal_to::equal_to()) {
|
|
|
|
UNORDERED_EPOINT("Mock equal_to default constructor.");
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
equal_to(equal_to const& x)
|
|
|
|
: tag_(x.tag_)
|
|
|
|
{
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(equal_to::equal_to(equal_to)) {
|
|
|
|
UNORDERED_EPOINT("Mock equal_to copy constructor.");
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
equal_to& operator=(equal_to const& x)
|
|
|
|
{
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(equal_to::operator=(equal_to)) {
|
|
|
|
UNORDERED_EPOINT("Mock equal_to assign operator 1.");
|
2006-05-21 17:14:11 +00:00
|
|
|
tag_ = x.tag_;
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_EPOINT("Mock equal_to assign operator 2.");
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
2006-10-31 22:19:26 +00:00
|
|
|
bool operator()(object const& x1, object const& x2) const {
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(equal_to::operator()(object, object)) {
|
|
|
|
UNORDERED_EPOINT("Mock equal_to function.");
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
switch(tag_) {
|
|
|
|
case 1:
|
|
|
|
return x1.tag1_ == x2.tag1_;
|
|
|
|
case 2:
|
|
|
|
return x1.tag2_ == x2.tag2_;
|
|
|
|
default:
|
|
|
|
return x1 == x2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
friend bool operator==(equal_to const& x1, equal_to const& x2) {
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(operator==(equal_to, equal_to)) {
|
|
|
|
UNORDERED_EPOINT("Mock equal_to equality function.");
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
return x1.tag_ == x2.tag_;
|
|
|
|
}
|
|
|
|
|
|
|
|
friend bool operator!=(equal_to const& x1, equal_to const& x2) {
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(operator!=(equal_to, equal_to)) {
|
|
|
|
UNORDERED_EPOINT("Mock equal_to inequality function.");
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
return x1.tag_ != x2.tag_;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
template <class T>
|
|
|
|
class allocator
|
|
|
|
{
|
|
|
|
public:
|
2006-12-03 23:08:17 +00:00
|
|
|
int tag_;
|
2006-05-21 17:14:11 +00:00
|
|
|
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;
|
|
|
|
|
|
|
|
template <class U> struct rebind { typedef allocator<U> other; };
|
|
|
|
|
2006-12-03 23:08:17 +00:00
|
|
|
explicit allocator(int t = 0) : tag_(t)
|
2006-05-21 17:14:11 +00:00
|
|
|
{
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(allocator::allocator()) {
|
|
|
|
UNORDERED_EPOINT("Mock allocator default constructor.");
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
2012-07-08 11:53:39 +00:00
|
|
|
test::detail::tracker.allocator_ref();
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
|
2006-12-03 23:08:17 +00:00
|
|
|
template <class Y> allocator(allocator<Y> const& x) : tag_(x.tag_)
|
2006-05-21 17:14:11 +00:00
|
|
|
{
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(allocator::allocator()) {
|
|
|
|
UNORDERED_EPOINT("Mock allocator template copy constructor.");
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
2012-07-08 11:53:39 +00:00
|
|
|
test::detail::tracker.allocator_ref();
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
|
2006-12-03 23:08:17 +00:00
|
|
|
allocator(allocator const& x) : tag_(x.tag_)
|
2006-05-21 17:14:11 +00:00
|
|
|
{
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(allocator::allocator()) {
|
|
|
|
UNORDERED_EPOINT("Mock allocator copy constructor.");
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
2012-07-08 11:53:39 +00:00
|
|
|
test::detail::tracker.allocator_ref();
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
|
2006-12-03 23:08:17 +00:00
|
|
|
~allocator() {
|
2012-07-08 11:53:39 +00:00
|
|
|
test::detail::tracker.allocator_unref();
|
2006-12-03 23:08:17 +00:00
|
|
|
}
|
2006-05-21 17:14:11 +00:00
|
|
|
|
2006-12-03 23:08:17 +00:00
|
|
|
allocator& operator=(allocator const& x) {
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(allocator::allocator()) {
|
|
|
|
UNORDERED_EPOINT("Mock allocator assignment operator.");
|
2006-12-03 23:08:17 +00:00
|
|
|
tag_ = x.tag_;
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
2006-10-31 22:19:26 +00:00
|
|
|
// If address throws, then it can't be used in erase or the
|
|
|
|
// destructor, which is very limiting. I need to check up on
|
|
|
|
// this.
|
|
|
|
|
2006-05-21 17:14:11 +00:00
|
|
|
pointer address(reference r) {
|
2008-01-13 16:19:26 +00:00
|
|
|
//UNORDERED_SCOPE(allocator::address(reference)) {
|
|
|
|
// UNORDERED_EPOINT("Mock allocator address function.");
|
2006-05-21 17:14:11 +00:00
|
|
|
//}
|
|
|
|
return pointer(&r);
|
|
|
|
}
|
|
|
|
|
|
|
|
const_pointer address(const_reference r) {
|
2008-01-13 16:19:26 +00:00
|
|
|
//UNORDERED_SCOPE(allocator::address(const_reference)) {
|
|
|
|
// UNORDERED_EPOINT("Mock allocator const address function.");
|
2006-05-21 17:14:11 +00:00
|
|
|
//}
|
|
|
|
return const_pointer(&r);
|
|
|
|
}
|
|
|
|
|
|
|
|
pointer allocate(size_type n) {
|
|
|
|
T* ptr = 0;
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(allocator::allocate(size_type)) {
|
|
|
|
UNORDERED_EPOINT("Mock allocator allocate function.");
|
2006-05-21 17:14:11 +00:00
|
|
|
|
|
|
|
using namespace std;
|
|
|
|
ptr = (T*) malloc(n * sizeof(T));
|
|
|
|
if(!ptr) throw std::bad_alloc();
|
|
|
|
}
|
2012-07-08 11:53:39 +00:00
|
|
|
test::detail::tracker.track_allocate((void*) ptr, n, sizeof(T), tag_);
|
2006-05-21 17:14:11 +00:00
|
|
|
return pointer(ptr);
|
|
|
|
|
|
|
|
//return pointer(static_cast<T*>(::operator new(n * sizeof(T))));
|
|
|
|
}
|
|
|
|
|
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-21 17:14:11 +00:00
|
|
|
{
|
|
|
|
T* ptr = 0;
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(allocator::allocate(size_type, const_pointer)) {
|
|
|
|
UNORDERED_EPOINT("Mock allocator allocate function.");
|
2006-05-21 17:14:11 +00:00
|
|
|
|
|
|
|
using namespace std;
|
|
|
|
ptr = (T*) malloc(n * sizeof(T));
|
|
|
|
if(!ptr) throw std::bad_alloc();
|
|
|
|
}
|
2012-07-08 11:53:39 +00:00
|
|
|
test::detail::tracker.track_allocate((void*) ptr, n, sizeof(T), tag_);
|
2006-05-21 17:14:11 +00:00
|
|
|
return pointer(ptr);
|
|
|
|
|
|
|
|
//return pointer(static_cast<T*>(::operator new(n * sizeof(T))));
|
|
|
|
}
|
|
|
|
|
2006-12-03 23:08:17 +00:00
|
|
|
void deallocate(pointer p, size_type n)
|
2006-05-21 17:14:11 +00:00
|
|
|
{
|
|
|
|
//::operator delete((void*) p);
|
|
|
|
if(p) {
|
2012-07-08 11:53:39 +00:00
|
|
|
test::detail::tracker.track_deallocate((void*) p, n, sizeof(T), tag_);
|
2006-05-21 17:14:11 +00:00
|
|
|
using namespace std;
|
|
|
|
free(p);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void construct(pointer p, T const& t) {
|
2011-08-11 21:18:43 +00:00
|
|
|
UNORDERED_SCOPE(allocator::construct(T*, T)) {
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_EPOINT("Mock allocator construct function.");
|
2006-05-21 17:14:11 +00:00
|
|
|
new(p) T(t);
|
|
|
|
}
|
2012-07-08 11:53:39 +00:00
|
|
|
test::detail::tracker.track_construct((void*) p, sizeof(T), tag_);
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
|
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) {
|
|
|
|
UNORDERED_SCOPE(allocator::construct(pointer, BOOST_FWD_REF(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
|
|
|
UNORDERED_EPOINT("Mock allocator construct function.");
|
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
|
|
|
}
|
2012-07-08 11:53:39 +00:00
|
|
|
test::detail::tracker.track_construct((void*) p, sizeof(T), tag_);
|
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) {
|
2012-07-08 11:53:39 +00:00
|
|
|
test::detail::tracker.track_destroy((void*) p, sizeof(T), tag_);
|
2006-12-03 23:08:17 +00:00
|
|
|
p->~T();
|
|
|
|
}
|
2006-05-21 17:14:11 +00:00
|
|
|
|
|
|
|
size_type max_size() const {
|
2008-01-13 16:19:26 +00:00
|
|
|
UNORDERED_SCOPE(allocator::construct(pointer, T)) {
|
|
|
|
UNORDERED_EPOINT("Mock allocator max_size function.");
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
return (std::numeric_limits<std::size_t>::max)();
|
|
|
|
}
|
2011-08-11 21:18:43 +00:00
|
|
|
|
|
|
|
typedef true_type propagate_on_container_copy_assignment;
|
|
|
|
typedef true_type propagate_on_container_move_assignment;
|
|
|
|
typedef true_type propagate_on_container_swap;
|
2006-05-21 17:14:11 +00:00
|
|
|
};
|
|
|
|
|
2007-07-17 23:17:21 +00:00
|
|
|
template <class T>
|
|
|
|
void swap(allocator<T>& x, allocator<T>& y)
|
|
|
|
{
|
|
|
|
std::swap(x.tag_, y.tag_);
|
|
|
|
}
|
|
|
|
|
2006-10-31 22:19:26 +00:00
|
|
|
// It's pretty much impossible to write a compliant swap when these
|
|
|
|
// two can throw. So they don't.
|
|
|
|
|
2006-05-21 17:14:11 +00:00
|
|
|
template <class T>
|
2006-12-03 23:08:17 +00:00
|
|
|
inline bool operator==(allocator<T> const& x, allocator<T> const& y)
|
2006-05-21 17:14:11 +00:00
|
|
|
{
|
2008-01-13 16:19:26 +00:00
|
|
|
//UNORDERED_SCOPE(operator==(allocator, allocator)) {
|
|
|
|
// UNORDERED_EPOINT("Mock allocator equality operator.");
|
2006-05-21 17:14:11 +00:00
|
|
|
//}
|
2006-12-03 23:08:17 +00:00
|
|
|
return x.tag_ == y.tag_;
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
template <class T>
|
|
|
|
inline bool operator!=(allocator<T> const& x, allocator<T> const& y)
|
|
|
|
{
|
2008-01-13 16:19:26 +00:00
|
|
|
//UNORDERED_SCOPE(operator!=(allocator, allocator)) {
|
|
|
|
// UNORDERED_EPOINT("Mock allocator inequality operator.");
|
2006-05-21 17:14:11 +00:00
|
|
|
//}
|
2006-12-03 23:08:17 +00:00
|
|
|
return x.tag_ != y.tag_;
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
2012-08-25 21:54:50 +00:00
|
|
|
|
|
|
|
template <class T>
|
|
|
|
class allocator2
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
int tag_;
|
|
|
|
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;
|
|
|
|
|
|
|
|
template <class U> struct rebind { typedef allocator2<U> other; };
|
|
|
|
|
|
|
|
explicit allocator2(int t = 0) : tag_(t)
|
|
|
|
{
|
|
|
|
UNORDERED_SCOPE(allocator2::allocator2()) {
|
|
|
|
UNORDERED_EPOINT("Mock allocator2 default constructor.");
|
|
|
|
}
|
|
|
|
test::detail::tracker.allocator_ref();
|
|
|
|
}
|
|
|
|
|
2012-08-28 08:04:51 +00:00
|
|
|
allocator2(allocator<T> const& x) : tag_(x.tag_)
|
2012-08-25 21:54:50 +00:00
|
|
|
{
|
|
|
|
UNORDERED_SCOPE(allocator2::allocator2()) {
|
2012-08-28 08:04:51 +00:00
|
|
|
UNORDERED_EPOINT("Mock allocator2 constructor from allocator.");
|
2012-08-25 21:54:50 +00:00
|
|
|
}
|
|
|
|
test::detail::tracker.allocator_ref();
|
|
|
|
}
|
|
|
|
|
|
|
|
template <class Y> allocator2(allocator2<Y> const& x) : tag_(x.tag_)
|
|
|
|
{
|
|
|
|
UNORDERED_SCOPE(allocator2::allocator2()) {
|
|
|
|
UNORDERED_EPOINT("Mock allocator2 template copy constructor.");
|
|
|
|
}
|
|
|
|
test::detail::tracker.allocator_ref();
|
|
|
|
}
|
|
|
|
|
|
|
|
allocator2(allocator2 const& x) : tag_(x.tag_)
|
|
|
|
{
|
|
|
|
UNORDERED_SCOPE(allocator2::allocator2()) {
|
|
|
|
UNORDERED_EPOINT("Mock allocator2 copy constructor.");
|
|
|
|
}
|
|
|
|
test::detail::tracker.allocator_ref();
|
|
|
|
}
|
|
|
|
|
|
|
|
~allocator2() {
|
|
|
|
test::detail::tracker.allocator_unref();
|
|
|
|
}
|
|
|
|
|
|
|
|
allocator2& operator=(allocator2 const& x) {
|
|
|
|
UNORDERED_SCOPE(allocator2::allocator2()) {
|
|
|
|
UNORDERED_EPOINT("Mock allocator2 assignment operator.");
|
|
|
|
tag_ = x.tag_;
|
|
|
|
}
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
// If address throws, then it can't be used in erase or the
|
|
|
|
// destructor, which is very limiting. I need to check up on
|
|
|
|
// this.
|
|
|
|
|
|
|
|
pointer address(reference r) {
|
|
|
|
//UNORDERED_SCOPE(allocator2::address(reference)) {
|
|
|
|
// UNORDERED_EPOINT("Mock allocator2 address function.");
|
|
|
|
//}
|
|
|
|
return pointer(&r);
|
|
|
|
}
|
|
|
|
|
|
|
|
const_pointer address(const_reference r) {
|
|
|
|
//UNORDERED_SCOPE(allocator2::address(const_reference)) {
|
|
|
|
// UNORDERED_EPOINT("Mock allocator2 const address function.");
|
|
|
|
//}
|
|
|
|
return const_pointer(&r);
|
|
|
|
}
|
|
|
|
|
|
|
|
pointer allocate(size_type n) {
|
|
|
|
T* ptr = 0;
|
|
|
|
UNORDERED_SCOPE(allocator2::allocate(size_type)) {
|
|
|
|
UNORDERED_EPOINT("Mock allocator2 allocate function.");
|
|
|
|
|
|
|
|
using namespace std;
|
|
|
|
ptr = (T*) malloc(n * sizeof(T));
|
|
|
|
if(!ptr) throw std::bad_alloc();
|
|
|
|
}
|
|
|
|
test::detail::tracker.track_allocate((void*) ptr, n, sizeof(T), tag_);
|
|
|
|
return pointer(ptr);
|
|
|
|
|
|
|
|
//return pointer(static_cast<T*>(::operator new(n * sizeof(T))));
|
|
|
|
}
|
|
|
|
|
|
|
|
pointer allocate(size_type n, void const* u)
|
|
|
|
{
|
|
|
|
T* ptr = 0;
|
|
|
|
UNORDERED_SCOPE(allocator2::allocate(size_type, const_pointer)) {
|
|
|
|
UNORDERED_EPOINT("Mock allocator2 allocate function.");
|
|
|
|
|
|
|
|
using namespace std;
|
|
|
|
ptr = (T*) malloc(n * sizeof(T));
|
|
|
|
if(!ptr) throw std::bad_alloc();
|
|
|
|
}
|
|
|
|
test::detail::tracker.track_allocate((void*) ptr, n, sizeof(T), tag_);
|
|
|
|
return pointer(ptr);
|
|
|
|
|
|
|
|
//return pointer(static_cast<T*>(::operator new(n * sizeof(T))));
|
|
|
|
}
|
|
|
|
|
|
|
|
void deallocate(pointer p, size_type n)
|
|
|
|
{
|
|
|
|
//::operator delete((void*) p);
|
|
|
|
if(p) {
|
|
|
|
test::detail::tracker.track_deallocate((void*) p, n, sizeof(T), tag_);
|
|
|
|
using namespace std;
|
|
|
|
free(p);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void construct(pointer p, T const& t) {
|
|
|
|
UNORDERED_SCOPE(allocator2::construct(T*, T)) {
|
|
|
|
UNORDERED_EPOINT("Mock allocator2 construct function.");
|
|
|
|
new(p) T(t);
|
|
|
|
}
|
|
|
|
test::detail::tracker.track_construct((void*) p, sizeof(T), tag_);
|
|
|
|
}
|
|
|
|
|
|
|
|
#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
|
|
|
|
template<class... Args> void construct(T* p, BOOST_FWD_REF(Args)... args) {
|
|
|
|
UNORDERED_SCOPE(allocator2::construct(pointer, BOOST_FWD_REF(Args)...)) {
|
|
|
|
UNORDERED_EPOINT("Mock allocator2 construct function.");
|
|
|
|
new(p) T(boost::forward<Args>(args)...);
|
|
|
|
}
|
|
|
|
test::detail::tracker.track_construct((void*) p, sizeof(T), tag_);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
void destroy(T* p) {
|
|
|
|
test::detail::tracker.track_destroy((void*) p, sizeof(T), tag_);
|
|
|
|
p->~T();
|
|
|
|
}
|
|
|
|
|
|
|
|
size_type max_size() const {
|
|
|
|
UNORDERED_SCOPE(allocator2::construct(pointer, T)) {
|
|
|
|
UNORDERED_EPOINT("Mock allocator2 max_size function.");
|
|
|
|
}
|
|
|
|
return (std::numeric_limits<std::size_t>::max)();
|
|
|
|
}
|
|
|
|
|
|
|
|
typedef false_type propagate_on_container_copy_assignment;
|
|
|
|
typedef false_type propagate_on_container_move_assignment;
|
|
|
|
typedef false_type propagate_on_container_swap;
|
|
|
|
};
|
|
|
|
|
|
|
|
template <class T>
|
|
|
|
void swap(allocator2<T>& x, allocator2<T>& y)
|
|
|
|
{
|
|
|
|
std::swap(x.tag_, y.tag_);
|
|
|
|
}
|
|
|
|
|
|
|
|
// It's pretty much impossible to write a compliant swap when these
|
|
|
|
// two can throw. So they don't.
|
|
|
|
|
|
|
|
template <class T>
|
|
|
|
inline bool operator==(allocator2<T> const& x, allocator2<T> const& y)
|
|
|
|
{
|
|
|
|
//UNORDERED_SCOPE(operator==(allocator2, allocator2)) {
|
|
|
|
// UNORDERED_EPOINT("Mock allocator2 equality operator.");
|
|
|
|
//}
|
|
|
|
return x.tag_ == y.tag_;
|
|
|
|
}
|
|
|
|
|
|
|
|
template <class T>
|
|
|
|
inline bool operator!=(allocator2<T> const& x, allocator2<T> const& y)
|
|
|
|
{
|
|
|
|
//UNORDERED_SCOPE(operator!=(allocator2, allocator2)) {
|
|
|
|
// UNORDERED_EPOINT("Mock allocator2 inequality operator.");
|
|
|
|
//}
|
|
|
|
return x.tag_ != y.tag_;
|
|
|
|
}
|
2006-05-21 17:14:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-01-12 14:43:40 +00:00
|
|
|
// Workaround for ADL deficient compilers
|
|
|
|
#if defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP)
|
|
|
|
namespace test
|
|
|
|
{
|
|
|
|
test::exception::object generate(test::exception::object const* x) {
|
|
|
|
return test::exception::generate(x);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2006-05-21 17:14:11 +00:00
|
|
|
#endif
|
2006-12-03 23:08:17 +00:00
|
|
|
|