2006-03-19 22:24:06 +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-03-19 22:24:06 +00:00
|
|
|
|
2008-01-08 13:59:01 +00:00
|
|
|
// Define some minimal classes which provide the bare minimum concepts to
|
|
|
|
// test that the containers don't rely on something that they shouldn't.
|
|
|
|
// They are not intended to be good examples of how to implement the concepts.
|
|
|
|
|
2006-03-19 22:24:06 +00:00
|
|
|
#if !defined(BOOST_UNORDERED_OBJECTS_MINIMAL_HEADER)
|
|
|
|
#define BOOST_UNORDERED_OBJECTS_MINIMAL_HEADER
|
|
|
|
|
|
|
|
#include <cstddef>
|
|
|
|
|
2007-08-14 09:55:30 +00:00
|
|
|
#if defined(BOOST_MSVC)
|
|
|
|
#pragma warning(push)
|
|
|
|
#pragma warning(disable:4100) // unreferenced formal parameter
|
|
|
|
#endif
|
|
|
|
|
2006-03-19 22:24:06 +00:00
|
|
|
namespace test
|
|
|
|
{
|
|
|
|
namespace minimal
|
|
|
|
{
|
|
|
|
class copy_constructible;
|
Merge in support for equality operators for the unordered containers and
hopefully better cross-platform support.
Merged revisions 44778-44835,44837-44918 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/trunk
........
r44778 | danieljames | 2008-04-26 17:15:44 +0100 (Sat, 26 Apr 2008) | 2 lines
Remove a trailing comma.
........
r44779 | danieljames | 2008-04-26 17:23:51 +0100 (Sat, 26 Apr 2008) | 1 line
Merge in support for equality operators.
........
r44780 | danieljames | 2008-04-26 17:28:44 +0100 (Sat, 26 Apr 2008) | 1 line
Use my own list container to avoid working around STL container bugs.
........
r44833 | danieljames | 2008-04-28 08:03:43 +0100 (Mon, 28 Apr 2008) | 1 line
Better equality tests.
........
r44834 | danieljames | 2008-04-28 08:04:03 +0100 (Mon, 28 Apr 2008) | 1 line
Remove a superfluous check.
........
r44835 | danieljames | 2008-04-28 08:04:21 +0100 (Mon, 28 Apr 2008) | 1 line
Add equality reference documentation.
........
r44916 | danieljames | 2008-04-30 08:16:52 +0100 (Wed, 30 Apr 2008) | 1 line
New version of list.hpp
........
r44917 | danieljames | 2008-04-30 08:18:31 +0100 (Wed, 30 Apr 2008) | 1 line
Support compilers without ADL in the compile tests.
........
r44918 | danieljames | 2008-04-30 08:25:20 +0100 (Wed, 30 Apr 2008) | 7 lines
Change the typedef of buffered functions as it was confusing MSVC 6.5
get_allocator wasn't compiling when the allocator workaround is used because it
couldn't cast from the wrapped allocator to an allocator of another type. So
use value_alloc_ when it's available (it's only unavailable on compilers with
C++0x support, which don't require the workaround).
........
[SVN r44919]
2008-04-30 07:57:04 +00:00
|
|
|
class copy_constructible_equality_comparable;
|
2007-11-16 00:31:12 +00:00
|
|
|
class default_copy_constructible;
|
2006-03-19 22:24:06 +00:00
|
|
|
class assignable;
|
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
|
|
|
|
2006-03-19 22:24:06 +00:00
|
|
|
template <class T> class hash;
|
|
|
|
template <class T> class equal_to;
|
2007-05-01 21:22:01 +00:00
|
|
|
template <class T> class ptr;
|
|
|
|
template <class T> class const_ptr;
|
2006-03-19 22:24:06 +00:00
|
|
|
template <class T> class allocator;
|
|
|
|
|
|
|
|
class copy_constructible
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
static copy_constructible create() { return copy_constructible(); }
|
|
|
|
copy_constructible(copy_constructible const&) {}
|
|
|
|
~copy_constructible() {}
|
|
|
|
private:
|
|
|
|
copy_constructible& operator=(copy_constructible const&);
|
|
|
|
copy_constructible() {}
|
|
|
|
};
|
|
|
|
|
Merge in support for equality operators for the unordered containers and
hopefully better cross-platform support.
Merged revisions 44778-44835,44837-44918 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/trunk
........
r44778 | danieljames | 2008-04-26 17:15:44 +0100 (Sat, 26 Apr 2008) | 2 lines
Remove a trailing comma.
........
r44779 | danieljames | 2008-04-26 17:23:51 +0100 (Sat, 26 Apr 2008) | 1 line
Merge in support for equality operators.
........
r44780 | danieljames | 2008-04-26 17:28:44 +0100 (Sat, 26 Apr 2008) | 1 line
Use my own list container to avoid working around STL container bugs.
........
r44833 | danieljames | 2008-04-28 08:03:43 +0100 (Mon, 28 Apr 2008) | 1 line
Better equality tests.
........
r44834 | danieljames | 2008-04-28 08:04:03 +0100 (Mon, 28 Apr 2008) | 1 line
Remove a superfluous check.
........
r44835 | danieljames | 2008-04-28 08:04:21 +0100 (Mon, 28 Apr 2008) | 1 line
Add equality reference documentation.
........
r44916 | danieljames | 2008-04-30 08:16:52 +0100 (Wed, 30 Apr 2008) | 1 line
New version of list.hpp
........
r44917 | danieljames | 2008-04-30 08:18:31 +0100 (Wed, 30 Apr 2008) | 1 line
Support compilers without ADL in the compile tests.
........
r44918 | danieljames | 2008-04-30 08:25:20 +0100 (Wed, 30 Apr 2008) | 7 lines
Change the typedef of buffered functions as it was confusing MSVC 6.5
get_allocator wasn't compiling when the allocator workaround is used because it
couldn't cast from the wrapped allocator to an allocator of another type. So
use value_alloc_ when it's available (it's only unavailable on compilers with
C++0x support, which don't require the workaround).
........
[SVN r44919]
2008-04-30 07:57:04 +00:00
|
|
|
class copy_constructible_equality_comparable
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
static copy_constructible_equality_comparable create() { return copy_constructible_equality_comparable(); }
|
|
|
|
copy_constructible_equality_comparable(copy_constructible_equality_comparable const&) {}
|
|
|
|
~copy_constructible_equality_comparable() {}
|
|
|
|
private:
|
|
|
|
copy_constructible_equality_comparable& operator=(copy_constructible_equality_comparable const&);
|
|
|
|
copy_constructible_equality_comparable() {}
|
|
|
|
};
|
|
|
|
|
|
|
|
bool operator==(copy_constructible_equality_comparable, copy_constructible_equality_comparable) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool operator!=(copy_constructible_equality_comparable, copy_constructible_equality_comparable) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2007-11-16 00:31:12 +00:00
|
|
|
class default_copy_constructible
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
static default_copy_constructible create() { return default_copy_constructible(); }
|
|
|
|
default_copy_constructible() {}
|
|
|
|
default_copy_constructible(default_copy_constructible const&) {}
|
|
|
|
~default_copy_constructible() {}
|
|
|
|
private:
|
|
|
|
default_copy_constructible& operator=(default_copy_constructible const&);
|
|
|
|
};
|
|
|
|
|
2006-03-19 22:24:06 +00:00
|
|
|
class assignable
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
static assignable create() { return assignable(); }
|
|
|
|
assignable(assignable const&) {}
|
|
|
|
assignable& operator=(assignable const&) { return *this; }
|
|
|
|
~assignable() {}
|
|
|
|
private:
|
|
|
|
assignable() {}
|
|
|
|
};
|
|
|
|
|
|
|
|
template <class T>
|
|
|
|
class hash
|
|
|
|
{
|
|
|
|
public:
|
2007-03-18 20:00:59 +00:00
|
|
|
static hash create() { return hash<T>(); }
|
2006-03-19 22:24:06 +00:00
|
|
|
hash() {}
|
|
|
|
hash(hash const&) {}
|
|
|
|
hash& operator=(hash const&) { return *this; }
|
|
|
|
~hash() {}
|
|
|
|
|
2006-10-31 22:19:26 +00:00
|
|
|
std::size_t operator()(T const&) const { return 0; }
|
2006-03-19 22:24:06 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
template <class T>
|
|
|
|
class equal_to
|
|
|
|
{
|
|
|
|
public:
|
2007-03-18 20:00:59 +00:00
|
|
|
static equal_to create() { return equal_to<T>(); }
|
2006-03-19 22:24:06 +00:00
|
|
|
equal_to() {}
|
|
|
|
equal_to(equal_to const&) {}
|
|
|
|
equal_to& operator=(equal_to const&) { return *this; }
|
|
|
|
~equal_to() {}
|
|
|
|
|
2007-03-18 20:00:59 +00:00
|
|
|
bool operator()(T const&, T const&) const { return true; }
|
2006-03-19 22:24:06 +00:00
|
|
|
};
|
|
|
|
|
2007-05-01 21:22:01 +00:00
|
|
|
template <class T> class ptr;
|
|
|
|
template <class T> class const_ptr;
|
2006-03-19 22:24:06 +00:00
|
|
|
|
|
|
|
template <class T>
|
2007-05-01 21:22:01 +00:00
|
|
|
class ptr
|
2006-03-19 22:24:06 +00:00
|
|
|
{
|
|
|
|
friend class allocator<T>;
|
2007-05-01 21:22:01 +00:00
|
|
|
friend class const_ptr<T>;
|
2006-03-19 22:24:06 +00:00
|
|
|
|
2006-03-20 20:01:45 +00:00
|
|
|
T* ptr_;
|
2006-03-19 22:24:06 +00:00
|
|
|
|
2007-05-19 20:04:14 +00:00
|
|
|
ptr(T* x) : ptr_(x) {}
|
2006-03-19 22:24:06 +00:00
|
|
|
public:
|
2007-05-01 21:22:01 +00:00
|
|
|
ptr() : ptr_(0) {}
|
2006-03-20 20:01:45 +00:00
|
|
|
|
|
|
|
T& operator*() const { return *ptr_; }
|
|
|
|
T* operator->() const { return ptr_; }
|
2007-05-01 21:22:01 +00:00
|
|
|
ptr& operator++() { ++ptr_; return *this; }
|
|
|
|
ptr operator++(int) { ptr tmp(*this); ++ptr_; return tmp; }
|
2008-01-08 13:59:01 +00:00
|
|
|
ptr operator+(std::ptrdiff_t s) const { return ptr<T>(ptr_ + s); }
|
|
|
|
friend ptr operator+(std::ptrdiff_t s, ptr p) { return ptr<T>(s + p.ptr_); }
|
|
|
|
T& operator[](std::ptrdiff_t s) const { return ptr_[s]; }
|
2006-03-20 20:01:45 +00:00
|
|
|
bool operator!() const { return !ptr_; }
|
2008-01-08 13:59:01 +00:00
|
|
|
|
|
|
|
// I'm not using the safe bool idiom because the containers should be
|
|
|
|
// able to cope with bool conversions.
|
|
|
|
operator bool() const { return !!ptr_; }
|
2006-03-20 20:01:45 +00:00
|
|
|
|
2007-05-01 21:22:01 +00:00
|
|
|
bool operator==(ptr const& x) const { return ptr_ == x.ptr_; }
|
|
|
|
bool operator!=(ptr const& x) const { return ptr_ != x.ptr_; }
|
|
|
|
bool operator<(ptr const& x) const { return ptr_ < x.ptr_; }
|
|
|
|
bool operator>(ptr const& x) const { return ptr_ > x.ptr_; }
|
|
|
|
bool operator<=(ptr const& x) const { return ptr_ <= x.ptr_; }
|
|
|
|
bool operator>=(ptr const& x) const { return ptr_ >= x.ptr_; }
|
|
|
|
|
|
|
|
bool operator==(const_ptr<T> const& x) const { return ptr_ == x.ptr_; }
|
|
|
|
bool operator!=(const_ptr<T> const& x) const { return ptr_ != x.ptr_; }
|
|
|
|
bool operator<(const_ptr<T> const& x) const { return ptr_ < x.ptr_; }
|
|
|
|
bool operator>(const_ptr<T> const& x) const { return ptr_ > x.ptr_; }
|
|
|
|
bool operator<=(const_ptr<T> const& x) const { return ptr_ <= x.ptr_; }
|
|
|
|
bool operator>=(const_ptr<T> const& x) const { return ptr_ >= x.ptr_; }
|
2006-03-19 22:24:06 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
template <class T>
|
2007-05-01 21:22:01 +00:00
|
|
|
class const_ptr
|
2006-03-19 22:24:06 +00:00
|
|
|
{
|
|
|
|
friend class allocator<T>;
|
|
|
|
|
2007-10-11 23:49:31 +00:00
|
|
|
T const* ptr_;
|
2006-03-19 22:24:06 +00:00
|
|
|
|
2007-10-11 23:49:31 +00:00
|
|
|
const_ptr(T const* ptr) : ptr_(ptr) {}
|
2006-03-19 22:24:06 +00:00
|
|
|
public:
|
2007-05-01 21:22:01 +00:00
|
|
|
const_ptr() : ptr_(0) {}
|
|
|
|
const_ptr(ptr<T> const& x) : ptr_(x.ptr_) {}
|
2006-03-20 20:01:45 +00:00
|
|
|
|
2007-10-11 23:49:31 +00:00
|
|
|
T const& operator*() const { return *ptr_; }
|
|
|
|
T const* operator->() const { return ptr_; }
|
2007-05-01 21:22:01 +00:00
|
|
|
const_ptr& operator++() { ++ptr_; return *this; }
|
|
|
|
const_ptr operator++(int) { const_ptr tmp(*this); ++ptr_; return tmp; }
|
2008-01-08 13:59:01 +00:00
|
|
|
const_ptr operator+(std::ptrdiff_t s) const { return const_ptr(ptr_ + s); }
|
|
|
|
friend const_ptr operator+(std::ptrdiff_t s, const_ptr p) { return ptr<T>(s + p.ptr_); }
|
2007-10-11 23:49:31 +00:00
|
|
|
T const& operator[](int s) const { return ptr_[s]; }
|
2006-03-20 20:01:45 +00:00
|
|
|
bool operator!() const { return !ptr_; }
|
2008-01-08 13:59:01 +00:00
|
|
|
operator bool() const { return !!ptr_; }
|
2006-03-20 20:01:45 +00:00
|
|
|
|
2007-05-01 21:22:01 +00:00
|
|
|
bool operator==(ptr<T> const& x) const { return ptr_ == x.ptr_; }
|
|
|
|
bool operator!=(ptr<T> const& x) const { return ptr_ != x.ptr_; }
|
|
|
|
bool operator<(ptr<T> const& x) const { return ptr_ < x.ptr_; }
|
|
|
|
bool operator>(ptr<T> const& x) const { return ptr_ > x.ptr_; }
|
|
|
|
bool operator<=(ptr<T> const& x) const { return ptr_ <= x.ptr_; }
|
|
|
|
bool operator>=(ptr<T> const& x) const { return ptr_ >= x.ptr_; }
|
|
|
|
|
|
|
|
bool operator==(const_ptr const& x) const { return ptr_ == x.ptr_; }
|
|
|
|
bool operator!=(const_ptr const& x) const { return ptr_ != x.ptr_; }
|
|
|
|
bool operator<(const_ptr const& x) const { return ptr_ < x.ptr_; }
|
|
|
|
bool operator>(const_ptr const& x) const { return ptr_ > x.ptr_; }
|
|
|
|
bool operator<=(const_ptr const& x) const { return ptr_ <= x.ptr_; }
|
|
|
|
bool operator>=(const_ptr const& x) const { return ptr_ >= x.ptr_; }
|
2006-03-19 22:24:06 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
template <class T>
|
|
|
|
class allocator
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
typedef std::size_t size_type;
|
|
|
|
typedef std::ptrdiff_t difference_type;
|
2007-05-01 21:22:01 +00:00
|
|
|
typedef ptr<T> pointer;
|
|
|
|
typedef const_ptr<T> const_pointer;
|
2006-03-19 22:24:06 +00:00
|
|
|
typedef T& reference;
|
|
|
|
typedef T const& const_reference;
|
|
|
|
typedef T value_type;
|
|
|
|
|
|
|
|
template <class U> struct rebind { typedef allocator<U> other; };
|
|
|
|
|
|
|
|
allocator() {}
|
|
|
|
template <class Y> allocator(allocator<Y> const&) {}
|
2006-03-20 20:01:45 +00:00
|
|
|
allocator(allocator const&) {}
|
2006-03-19 22:24:06 +00:00
|
|
|
~allocator() {}
|
|
|
|
|
|
|
|
pointer address(reference r) { return pointer(&r); }
|
|
|
|
const_pointer address(const_reference r) { return const_pointer(&r); }
|
|
|
|
|
|
|
|
pointer allocate(size_type n) {
|
|
|
|
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
|
|
|
template <class Y>
|
|
|
|
pointer allocate(size_type n, const_ptr<Y> u)
|
2006-03-19 22:24:06 +00:00
|
|
|
{
|
|
|
|
return pointer(static_cast<T*>(::operator new(n * sizeof(T))));
|
|
|
|
}
|
|
|
|
|
2006-10-31 22:19:26 +00:00
|
|
|
void deallocate(pointer p, size_type)
|
2006-03-19 22:24:06 +00:00
|
|
|
{
|
|
|
|
::operator delete((void*) p.ptr_);
|
|
|
|
}
|
|
|
|
|
|
|
|
void construct(pointer p, T const& t) { new((void*)p.ptr_) T(t); }
|
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
|
|
|
|
2009-05-20 06:43:38 +00:00
|
|
|
#if defined(BOOST_UNORDERED_STD_FORWARD)
|
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
|
|
|
template<class... Args> void construct(pointer p, Args&&... args) {
|
|
|
|
new((void*)p.ptr_) T(std::forward<Args>(args)...);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2006-03-19 22:24:06 +00:00
|
|
|
void destroy(pointer p) { ((T*)p.ptr_)->~T(); }
|
|
|
|
|
|
|
|
size_type max_size() const { return 1000; }
|
2006-03-20 20:01:45 +00:00
|
|
|
|
Merged revisions 41822-41992,41994-42101 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/dev
........
r41822 | danieljames | 2007-12-07 12:51:54 +0000 (Fri, 07 Dec 2007) | 5 lines
Change the macros to meet boost guidelines.
I should really have done this before the review. At least it'll give them
something to say.
........
r41928 | danieljames | 2007-12-09 19:23:27 +0000 (Sun, 09 Dec 2007) | 1 line
Add some parameters to standalone documentation build.
........
r41929 | danieljames | 2007-12-09 19:24:07 +0000 (Sun, 09 Dec 2007) | 1 line
An extra rehash test for inserting a range.
........
r41930 | danieljames | 2007-12-09 19:24:52 +0000 (Sun, 09 Dec 2007) | 1 line
get_for_erase can be static because all the required information is in the iterator.
........
r41931 | danieljames | 2007-12-09 19:31:00 +0000 (Sun, 09 Dec 2007) | 1 line
ADL doesn't seem to be working properly on Visual C++ 7.1 when calling swap, so workaround this in the compile tests.
........
r41932 | danieljames | 2007-12-09 19:44:46 +0000 (Sun, 09 Dec 2007) | 1 line
Try to make the erase exception requirements a little clearer.
........
r41933 | danieljames | 2007-12-09 19:52:50 +0000 (Sun, 09 Dec 2007) | 1 line
Hopefully clearer comparison of accessors for comparison/hash function objects.
........
r41943 | danieljames | 2007-12-10 00:03:53 +0000 (Mon, 10 Dec 2007) | 1 line
Fix a typo.
........
r41951 | danieljames | 2007-12-10 11:08:02 +0000 (Mon, 10 Dec 2007) | 1 line
Use the locale in the case insensitive comparison, I really should add a test for this.
........
r41994 | danieljames | 2007-12-13 00:26:05 +0000 (Thu, 13 Dec 2007) | 3 lines
Hervé Brönnimann's improved explanation of the formula for avoiding
invalidating iterators.
........
r41995 | danieljames | 2007-12-13 00:30:46 +0000 (Thu, 13 Dec 2007) | 4 lines
Explicity use the classic locale in the case insensitive example. I could make
the locale a member, but that would make the example longer. Also, this would be
a good place to put a note about the need for constant function objects.
........
r41996 | danieljames | 2007-12-13 00:31:55 +0000 (Thu, 13 Dec 2007) | 1 line
Pull the point examples out into test files - fixing a few bugs in the process.
........
r41997 | danieljames | 2007-12-13 00:41:30 +0000 (Thu, 13 Dec 2007) | 3 lines
A few reference links for boost::hash, it might be better to link to the
first page of the Boost.Hash documentation though.
........
r42092 | danieljames | 2007-12-16 10:07:27 +0000 (Sun, 16 Dec 2007) | 2 lines
Fix some typos, and use American spelling.
........
r42093 | danieljames | 2007-12-16 10:11:00 +0000 (Sun, 16 Dec 2007) | 1 line
Small documentation tweak.
........
r42096 | danieljames | 2007-12-16 10:17:03 +0000 (Sun, 16 Dec 2007) | 1 line
Fix some reference documentation errors.
........
r42097 | danieljames | 2007-12-16 10:28:08 +0000 (Sun, 16 Dec 2007) | 1 line
Document the explicit constructors.
........
r42098 | danieljames | 2007-12-16 10:47:13 +0000 (Sun, 16 Dec 2007) | 1 line
Try to make the active issues and proposals a little clearer - including more obvious links to the relevant papers.
........
r42099 | danieljames | 2007-12-16 10:52:30 +0000 (Sun, 16 Dec 2007) | 1 line
Fix some complexity errors in the comparison table.
........
r42100 | danieljames | 2007-12-16 10:59:45 +0000 (Sun, 16 Dec 2007) | 1 line
Use Mapped instead of T in the documentation.
........
r42101 | danieljames | 2007-12-16 11:06:16 +0000 (Sun, 16 Dec 2007) | 1 line
Remove hard-coded length of prime numbers.
........
[SVN r42187]
2007-12-19 23:09:09 +00:00
|
|
|
#if defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP) || \
|
2008-09-15 21:48:46 +00:00
|
|
|
BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
|
2006-03-20 20:01:45 +00:00
|
|
|
public: allocator& operator=(allocator const&) { return *this;}
|
|
|
|
#else
|
|
|
|
private: allocator& operator=(allocator const&);
|
|
|
|
#endif
|
2006-03-19 22:24:06 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
template <class T>
|
2006-10-31 22:19:26 +00:00
|
|
|
inline bool operator==(allocator<T> const&, allocator<T> const&)
|
2006-03-19 22:24:06 +00:00
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
template <class T>
|
2006-10-31 22:19:26 +00:00
|
|
|
inline bool operator!=(allocator<T> const&, allocator<T> const&)
|
2006-03-19 22:24:06 +00:00
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
template <class T>
|
2006-10-31 22:19:26 +00:00
|
|
|
void swap(allocator<T>&, allocator<T>&)
|
2006-03-19 22:24:06 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Merge in support for equality operators for the unordered containers and
hopefully better cross-platform support.
Merged revisions 44778-44835,44837-44918 via svnmerge from
https://svn.boost.org/svn/boost/branches/unordered/trunk
........
r44778 | danieljames | 2008-04-26 17:15:44 +0100 (Sat, 26 Apr 2008) | 2 lines
Remove a trailing comma.
........
r44779 | danieljames | 2008-04-26 17:23:51 +0100 (Sat, 26 Apr 2008) | 1 line
Merge in support for equality operators.
........
r44780 | danieljames | 2008-04-26 17:28:44 +0100 (Sat, 26 Apr 2008) | 1 line
Use my own list container to avoid working around STL container bugs.
........
r44833 | danieljames | 2008-04-28 08:03:43 +0100 (Mon, 28 Apr 2008) | 1 line
Better equality tests.
........
r44834 | danieljames | 2008-04-28 08:04:03 +0100 (Mon, 28 Apr 2008) | 1 line
Remove a superfluous check.
........
r44835 | danieljames | 2008-04-28 08:04:21 +0100 (Mon, 28 Apr 2008) | 1 line
Add equality reference documentation.
........
r44916 | danieljames | 2008-04-30 08:16:52 +0100 (Wed, 30 Apr 2008) | 1 line
New version of list.hpp
........
r44917 | danieljames | 2008-04-30 08:18:31 +0100 (Wed, 30 Apr 2008) | 1 line
Support compilers without ADL in the compile tests.
........
r44918 | danieljames | 2008-04-30 08:25:20 +0100 (Wed, 30 Apr 2008) | 7 lines
Change the typedef of buffered functions as it was confusing MSVC 6.5
get_allocator wasn't compiling when the allocator workaround is used because it
couldn't cast from the wrapped allocator to an allocator of another type. So
use value_alloc_ when it's available (it's only unavailable on compilers with
C++0x support, which don't require the workaround).
........
[SVN r44919]
2008-04-30 07:57:04 +00:00
|
|
|
#if defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP)
|
|
|
|
namespace boost {
|
|
|
|
#else
|
|
|
|
namespace test {
|
|
|
|
namespace minimal {
|
|
|
|
#endif
|
|
|
|
std::size_t hash_value(test::minimal::copy_constructible_equality_comparable) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#if !defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP)
|
|
|
|
}}
|
|
|
|
#else
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2007-08-14 09:55:30 +00:00
|
|
|
#if defined(BOOST_MSVC)
|
|
|
|
#pragma warning(pop)
|
|
|
|
#endif
|
|
|
|
|
2006-03-19 22:24:06 +00:00
|
|
|
#endif
|