2006-08-06 20:42:45 +00:00
|
|
|
|
Merge hash and unordered changes.
Remove deprecated headers, move hash_fwd.hpp into hash subdirectory. And
several minor internal changes.
Mostly minor internal details.
Merged revisions 51262-51263,51407-51409,51504-51505,51644-51646,51667 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r51262 | danieljames | 2009-02-15 19:32:04 +0000 (Sun, 15 Feb 2009) | 1 line
Use the new 'boost:' links for the hash, unordered and quickbook documentation.
........
r51263 | danieljames | 2009-02-15 19:32:19 +0000 (Sun, 15 Feb 2009) | 2 lines
Don't copy images for the standalone hash and unordered documentation, was only
really required before the libraries were integrated into boost.
........
r51407 | danieljames | 2009-02-22 23:49:51 +0000 (Sun, 22 Feb 2009) | 1 line
Fix the hash dirname.
........
r51408 | danieljames | 2009-02-22 23:50:04 +0000 (Sun, 22 Feb 2009) | 1 line
Make copy_buckets and move_buckets member functions - so that calling them is a bit simpler.
........
r51409 | danieljames | 2009-02-22 23:50:20 +0000 (Sun, 22 Feb 2009) | 1 line
Move some of the data structure classes out of hash table data.
........
r51504 | danieljames | 2009-03-01 14:15:09 +0000 (Sun, 01 Mar 2009) | 1 line
Add missing return for operator=.
........
r51505 | danieljames | 2009-03-01 14:15:39 +0000 (Sun, 01 Mar 2009) | 3 lines
Make the sort stable.
Doesn't really matter, but it might as well be.
........
r51644 | danieljames | 2009-03-08 09:44:51 +0000 (Sun, 08 Mar 2009) | 1 line
Detab.
........
r51645 | danieljames | 2009-03-08 09:45:11 +0000 (Sun, 08 Mar 2009) | 4 lines
Move hash_fwd into the hash subdirectory.
I should have done this in the last release. But now all of the hash
implementation is in the hash subdirectory.
........
r51646 | danieljames | 2009-03-08 09:45:30 +0000 (Sun, 08 Mar 2009) | 3 lines
Remove deprecated headers.
Fixes #2412.
........
r51667 | danieljames | 2009-03-09 20:56:23 +0000 (Mon, 09 Mar 2009) | 1 line
Update copyright dates in hash and unordered.
........
[SVN r51729]
2009-03-11 22:51:09 +00:00
|
|
|
// Copyright 2005-2009 Daniel James.
|
2006-08-06 20:42:45 +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)
|
|
|
|
|
|
|
|
|
|
#if !defined(BOOST_UNORDERED_TEST_HELPERS_INPUT_ITERATOR_HEADER)
|
|
|
|
|
#define BOOST_UNORDERED_TEST_HELPERS_INPUT_ITERATOR_HEADER
|
|
|
|
|
|
Merge unordered changes, including fixes for Boost.TR1.
Merged revisions 55099-55100,55132,55138,55184-55185 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r55099 | danieljames | 2009-07-22 23:37:52 +0100 (Wed, 22 Jul 2009) | 1 line
Fix the insert tests when there is a small number of buckets.
........
r55100 | danieljames | 2009-07-22 23:38:08 +0100 (Wed, 22 Jul 2009) | 1 line
Adjust the unordered defaults so that emplace takes more parameters and less buckets are created by default.
........
r55132 | danieljames | 2009-07-23 18:53:59 +0100 (Thu, 23 Jul 2009) | 1 line
Remove the emulation of single argument C++0x std::pair constructor.
........
r55138 | danieljames | 2009-07-23 23:17:20 +0100 (Thu, 23 Jul 2009) | 1 line
Try to work around an odd Visual C++ 8 bug.
........
r55184 | danieljames | 2009-07-26 19:59:33 +0100 (Sun, 26 Jul 2009) | 1 line
Some extra changelog notes.
........
r55185 | danieljames | 2009-07-26 20:00:40 +0100 (Sun, 26 Jul 2009) | 1 line
Update the reference documentation to mention that emplace is now emulated.
........
[SVN r55189]
2009-07-26 20:22:48 +00:00
|
|
|
#include <boost/config.hpp>
|
2009-12-07 19:26:26 +00:00
|
|
|
#include <boost/iterator.hpp>
|
|
|
|
|
#include <boost/iterator/iterator_traits.hpp>
|
2006-08-06 20:42:45 +00:00
|
|
|
|
|
|
|
|
namespace test
|
|
|
|
|
{
|
Merge unordered changes, including fixes for Boost.TR1.
Merged revisions 55099-55100,55132,55138,55184-55185 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r55099 | danieljames | 2009-07-22 23:37:52 +0100 (Wed, 22 Jul 2009) | 1 line
Fix the insert tests when there is a small number of buckets.
........
r55100 | danieljames | 2009-07-22 23:38:08 +0100 (Wed, 22 Jul 2009) | 1 line
Adjust the unordered defaults so that emplace takes more parameters and less buckets are created by default.
........
r55132 | danieljames | 2009-07-23 18:53:59 +0100 (Thu, 23 Jul 2009) | 1 line
Remove the emulation of single argument C++0x std::pair constructor.
........
r55138 | danieljames | 2009-07-23 23:17:20 +0100 (Thu, 23 Jul 2009) | 1 line
Try to work around an odd Visual C++ 8 bug.
........
r55184 | danieljames | 2009-07-26 19:59:33 +0100 (Sun, 26 Jul 2009) | 1 line
Some extra changelog notes.
........
r55185 | danieljames | 2009-07-26 20:00:40 +0100 (Sun, 26 Jul 2009) | 1 line
Update the reference documentation to mention that emplace is now emulated.
........
[SVN r55189]
2009-07-26 20:22:48 +00:00
|
|
|
template <class Iterator>
|
|
|
|
|
struct proxy
|
|
|
|
|
{
|
|
|
|
|
typedef BOOST_DEDUCED_TYPENAME Iterator::value_type value_type;
|
|
|
|
|
|
2009-12-07 19:26:26 +00:00
|
|
|
explicit proxy(value_type const& v) : v_(v) {}
|
Merge unordered changes, including fixes for Boost.TR1.
Merged revisions 55099-55100,55132,55138,55184-55185 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r55099 | danieljames | 2009-07-22 23:37:52 +0100 (Wed, 22 Jul 2009) | 1 line
Fix the insert tests when there is a small number of buckets.
........
r55100 | danieljames | 2009-07-22 23:38:08 +0100 (Wed, 22 Jul 2009) | 1 line
Adjust the unordered defaults so that emplace takes more parameters and less buckets are created by default.
........
r55132 | danieljames | 2009-07-23 18:53:59 +0100 (Thu, 23 Jul 2009) | 1 line
Remove the emulation of single argument C++0x std::pair constructor.
........
r55138 | danieljames | 2009-07-23 23:17:20 +0100 (Thu, 23 Jul 2009) | 1 line
Try to work around an odd Visual C++ 8 bug.
........
r55184 | danieljames | 2009-07-26 19:59:33 +0100 (Sun, 26 Jul 2009) | 1 line
Some extra changelog notes.
........
r55185 | danieljames | 2009-07-26 20:00:40 +0100 (Sun, 26 Jul 2009) | 1 line
Update the reference documentation to mention that emplace is now emulated.
........
[SVN r55189]
2009-07-26 20:22:48 +00:00
|
|
|
proxy(proxy const& x) : v_(x.v_) {}
|
|
|
|
|
operator value_type const&() const { return v_; }
|
|
|
|
|
|
|
|
|
|
value_type v_;
|
2009-11-28 11:40:08 +00:00
|
|
|
private:
|
|
|
|
|
proxy& operator=(proxy const&);
|
Merge unordered changes, including fixes for Boost.TR1.
Merged revisions 55099-55100,55132,55138,55184-55185 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r55099 | danieljames | 2009-07-22 23:37:52 +0100 (Wed, 22 Jul 2009) | 1 line
Fix the insert tests when there is a small number of buckets.
........
r55100 | danieljames | 2009-07-22 23:38:08 +0100 (Wed, 22 Jul 2009) | 1 line
Adjust the unordered defaults so that emplace takes more parameters and less buckets are created by default.
........
r55132 | danieljames | 2009-07-23 18:53:59 +0100 (Thu, 23 Jul 2009) | 1 line
Remove the emulation of single argument C++0x std::pair constructor.
........
r55138 | danieljames | 2009-07-23 23:17:20 +0100 (Thu, 23 Jul 2009) | 1 line
Try to work around an odd Visual C++ 8 bug.
........
r55184 | danieljames | 2009-07-26 19:59:33 +0100 (Sun, 26 Jul 2009) | 1 line
Some extra changelog notes.
........
r55185 | danieljames | 2009-07-26 20:00:40 +0100 (Sun, 26 Jul 2009) | 1 line
Update the reference documentation to mention that emplace is now emulated.
........
[SVN r55189]
2009-07-26 20:22:48 +00:00
|
|
|
};
|
|
|
|
|
|
2006-08-06 20:42:45 +00:00
|
|
|
template <class Iterator>
|
|
|
|
|
struct input_iterator_adaptor
|
2009-12-07 19:26:26 +00:00
|
|
|
: public boost::iterator<
|
|
|
|
|
std::input_iterator_tag,
|
|
|
|
|
BOOST_DEDUCED_TYPENAME boost::iterator_value<Iterator>::type,
|
|
|
|
|
std::ptrdiff_t,
|
|
|
|
|
BOOST_DEDUCED_TYPENAME boost::iterator_pointer<Iterator>::type,
|
|
|
|
|
proxy<Iterator>
|
|
|
|
|
>
|
2006-08-06 20:42:45 +00:00
|
|
|
{
|
2009-12-07 19:26:26 +00:00
|
|
|
typedef BOOST_DEDUCED_TYPENAME boost::iterator_value<Iterator>::type
|
|
|
|
|
value_type;
|
|
|
|
|
|
|
|
|
|
input_iterator_adaptor()
|
|
|
|
|
: base_() {}
|
|
|
|
|
explicit input_iterator_adaptor(Iterator& it)
|
|
|
|
|
: base_(&it) {}
|
|
|
|
|
proxy<Iterator> operator*() const {
|
|
|
|
|
return proxy<Iterator>(**base_);
|
|
|
|
|
}
|
|
|
|
|
value_type* operator->() const {
|
|
|
|
|
return &**base_;
|
|
|
|
|
}
|
|
|
|
|
input_iterator_adaptor& operator++() {
|
|
|
|
|
++*base_; return *this;
|
|
|
|
|
}
|
|
|
|
|
//input_iterator_adaptor operator++(int) {
|
|
|
|
|
//}
|
|
|
|
|
bool operator==(input_iterator_adaptor const& x) const {
|
|
|
|
|
return *base_ == *x.base_;
|
|
|
|
|
}
|
|
|
|
|
bool operator!=(input_iterator_adaptor const& x) const {
|
|
|
|
|
return *base_ != *x.base_;
|
|
|
|
|
}
|
|
|
|
|
private:
|
|
|
|
|
Iterator* base_;
|
2006-08-06 20:42:45 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
template <class Iterator>
|
2009-12-07 19:26:26 +00:00
|
|
|
input_iterator_adaptor<Iterator> input_iterator(Iterator& it)
|
2006-08-06 20:42:45 +00:00
|
|
|
{
|
|
|
|
|
return input_iterator_adaptor<Iterator>(it);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|