2008-01-12 14:43:40 +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 2006-2009 Daniel James.
|
2008-01-12 14:43:40 +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_TEST_HEADER)
|
|
|
|
#define BOOST_UNORDERED_TEST_TEST_HEADER
|
|
|
|
|
Merge latest changes for unordered. Improved compatability and a few tweaks.
Merged revisions 53127,53253,53256,53311,53314,53316-53318 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r53127 | danieljames | 2009-05-20 07:43:38 +0100 (Wed, 20 May 2009) | 1 line
Better configuration for boost.unordered.
........
r53253 | danieljames | 2009-05-25 20:14:07 +0100 (Mon, 25 May 2009) | 3 lines
Add explicit destructors to the unordered containers. Refs #2908.
Isn't really needed but it doesn't hurt.
........
r53256 | danieljames | 2009-05-25 20:45:23 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log for explicit destructors.
........
r53311 | danieljames | 2009-05-27 18:42:01 +0100 (Wed, 27 May 2009) | 1 line
Missing changelog entry.
........
r53314 | danieljames | 2009-05-27 18:44:09 +0100 (Wed, 27 May 2009) | 1 line
Use lightweight_test for unordered.
........
r53316 | danieljames | 2009-05-27 19:19:32 +0100 (Wed, 27 May 2009) | 1 line
Some workarounds for old versions of Borland.
........
r53317 | danieljames | 2009-05-27 19:32:22 +0100 (Wed, 27 May 2009) | 1 line
Fix a change accidentally included in the last commit.
........
r53318 | danieljames | 2009-05-27 19:32:38 +0100 (Wed, 27 May 2009) | 1 line
Remove an unused function.
........
[SVN r53465]
2009-05-30 17:34:12 +00:00
|
|
|
#include <boost/detail/lightweight_test.hpp>
|
2008-03-24 17:03:15 +00:00
|
|
|
#include <boost/preprocessor/cat.hpp>
|
2008-05-28 06:19:26 +00:00
|
|
|
#include <boost/preprocessor/stringize.hpp>
|
2008-05-26 13:02:19 +00:00
|
|
|
#include <iostream>
|
2008-03-24 17:03:15 +00:00
|
|
|
|
|
|
|
#define UNORDERED_AUTO_TEST(x) \
|
|
|
|
struct BOOST_PP_CAT(x, _type) : public ::test::registered_test_base { \
|
2008-05-26 13:02:19 +00:00
|
|
|
BOOST_PP_CAT(x, _type)() \
|
|
|
|
: ::test::registered_test_base(BOOST_PP_STRINGIZE(x)) \
|
|
|
|
{ \
|
2008-03-24 17:03:15 +00:00
|
|
|
::test::test_list::add_test(this); \
|
|
|
|
} \
|
|
|
|
void run(); \
|
|
|
|
}; \
|
|
|
|
BOOST_PP_CAT(x, _type) x; \
|
|
|
|
void BOOST_PP_CAT(x, _type)::run()
|
Merge latest changes for unordered. Improved compatability and a few tweaks.
Merged revisions 53127,53253,53256,53311,53314,53316-53318 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r53127 | danieljames | 2009-05-20 07:43:38 +0100 (Wed, 20 May 2009) | 1 line
Better configuration for boost.unordered.
........
r53253 | danieljames | 2009-05-25 20:14:07 +0100 (Mon, 25 May 2009) | 3 lines
Add explicit destructors to the unordered containers. Refs #2908.
Isn't really needed but it doesn't hurt.
........
r53256 | danieljames | 2009-05-25 20:45:23 +0100 (Mon, 25 May 2009) | 1 line
Unordered change log for explicit destructors.
........
r53311 | danieljames | 2009-05-27 18:42:01 +0100 (Wed, 27 May 2009) | 1 line
Missing changelog entry.
........
r53314 | danieljames | 2009-05-27 18:44:09 +0100 (Wed, 27 May 2009) | 1 line
Use lightweight_test for unordered.
........
r53316 | danieljames | 2009-05-27 19:19:32 +0100 (Wed, 27 May 2009) | 1 line
Some workarounds for old versions of Borland.
........
r53317 | danieljames | 2009-05-27 19:32:22 +0100 (Wed, 27 May 2009) | 1 line
Fix a change accidentally included in the last commit.
........
r53318 | danieljames | 2009-05-27 19:32:38 +0100 (Wed, 27 May 2009) | 1 line
Remove an unused function.
........
[SVN r53465]
2009-05-30 17:34:12 +00:00
|
|
|
#define RUN_TESTS() int main(int, char**) \
|
|
|
|
{ ::test::test_list::run_tests(); return boost::report_errors(); }
|
2008-03-24 17:03:15 +00:00
|
|
|
|
|
|
|
namespace test {
|
|
|
|
struct registered_test_base {
|
|
|
|
registered_test_base* next;
|
2008-05-26 13:02:19 +00:00
|
|
|
char const* name;
|
|
|
|
explicit registered_test_base(char const* n) : name(n) {}
|
2008-03-24 17:03:15 +00:00
|
|
|
virtual void run() = 0;
|
|
|
|
virtual ~registered_test_base() {}
|
|
|
|
};
|
|
|
|
|
|
|
|
namespace test_list {
|
|
|
|
static inline registered_test_base*& first() {
|
|
|
|
static registered_test_base* ptr = 0;
|
|
|
|
return ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline registered_test_base*& last() {
|
|
|
|
static registered_test_base* ptr = 0;
|
|
|
|
return ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void add_test(registered_test_base* test) {
|
|
|
|
if(last()) {
|
|
|
|
last()->next = test;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
first() = test;
|
|
|
|
}
|
|
|
|
|
|
|
|
last() = test;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void run_tests() {
|
2008-05-26 13:02:19 +00:00
|
|
|
for(registered_test_base* i = first(); i; i = i->next) {
|
|
|
|
std::cout<<"Running "<<i->name<<"\n"<<std::flush;
|
2008-03-24 17:03:15 +00:00
|
|
|
i->run();
|
2008-05-26 13:02:19 +00:00
|
|
|
std::cerr<<std::flush;
|
|
|
|
std::cout<<std::flush;
|
|
|
|
}
|
2008-03-24 17:03:15 +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
|
|
|
}
|
2008-03-24 17:03:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#include <boost/preprocessor/seq/for_each_product.hpp>
|
|
|
|
#include <boost/preprocessor/seq/fold_left.hpp>
|
|
|
|
#include <boost/preprocessor/seq/to_tuple.hpp>
|
|
|
|
#include <boost/preprocessor/seq/seq.hpp>
|
|
|
|
#include <boost/preprocessor/cat.hpp>
|
|
|
|
|
|
|
|
// Run test with every combination of the parameters (a sequence of sequences)
|
|
|
|
#define UNORDERED_TEST(name, parameters) \
|
|
|
|
BOOST_PP_SEQ_FOR_EACH_PRODUCT(UNORDERED_TEST_OP, ((name)) parameters)
|
|
|
|
|
|
|
|
#define UNORDERED_TEST_OP(r, product) \
|
|
|
|
UNORDERED_TEST_OP2( \
|
|
|
|
BOOST_PP_SEQ_HEAD(product), \
|
|
|
|
BOOST_PP_SEQ_TAIL(product))
|
|
|
|
|
|
|
|
#define UNORDERED_TEST_OP2(name, params) \
|
|
|
|
UNORDERED_AUTO_TEST(BOOST_PP_SEQ_FOLD_LEFT(UNORDERED_TEST_OP_JOIN, name, params)) { \
|
|
|
|
name BOOST_PP_SEQ_TO_TUPLE(params); \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define UNORDERED_TEST_OP_JOIN(s, state, elem) \
|
|
|
|
BOOST_PP_CAT(state, BOOST_PP_CAT(_, elem))
|
|
|
|
|
2008-01-12 14:43:40 +00:00
|
|
|
#endif
|