Update the portable example to hopefully be more generally portable.

Change hash_fwd_test to avoid a Borland bug, add 'hash_friend_test' to test for it.

Fix a typo in hash_fwd_test.


[SVN r32747]
This commit is contained in:
Daniel James
2006-02-08 19:03:09 +00:00
parent bb702b827e
commit 47df6bd0fe
5 changed files with 82 additions and 66 deletions
+1
View File
@@ -33,6 +33,7 @@ rule hash-test ( names + : extras * )
[ hash-test hash_range_test ]
[ hash-test hash_custom_test ]
[ hash-test hash_global_namespace_test ]
[ hash-test hash_friend_test ]
[ hash-test hash_built_in_array_test ]
[ hash-test hash_value_array_test ]
[ hash-test hash_vector_test ]
+1
View File
@@ -25,6 +25,7 @@ test-suite functional/hash
[ run hash_range_test.cpp framework ]
[ run hash_custom_test.cpp framework ]
[ run hash_global_namespace_test.cpp framework ]
[ run hash_friend_test.cpp framework ]
[ run hash_built_in_array_test.cpp framework ]
[ run hash_value_array_test.cpp framework ]
[ run hash_vector_test.cpp framework ]
+26 -23
View File
@@ -14,29 +14,32 @@
namespace test {
template <class T>
struct test_type1
{
T value;
test_type1(T const& x) : value(x) {}
template <class T>
struct test_type1
{
T value;
test_type1(T const& x) : value(x) {}
};
#if !defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP)
friend std::size_t hash_value(test_type1<T> const& x)
template <class T>
std::size_t hash_value(test_type1<T> const& x)
{
HASH_NAMESPACE::hash<T> hasher;
return hasher(x.value);
}
#endif
};
template <class T>
struct test_type2
{
T value1, value2;
test_type2(T const& x, T const& y) : value1(x), value2(y) {}
template <class T>
struct test_type2
{
T value1, value2;
test_type2(T const& x, T const& y) : value1(x), value2(y) {}
};
#if !defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP)
friend std::size_t hash_value(test_type2<T> const& x)
template <class T>
std::size_t hash_value(test_type2<T> const& x)
{
std::size_t seed = 0;
HASH_NAMESPACE::hash_combine(seed, x.value1);
@@ -44,28 +47,28 @@ struct test_type2
return seed;
}
#endif
};
template <class T>
struct test_type3
{
std::vector<T> values;
test_type3(typename std::vector<T>::iterator x,
typename std::vector<T>::iterator y) : values(x, y) {}
template <class T>
struct test_type3
{
std::vector<T> values;
test_type3(typename std::vector<T>::iterator x,
typename std::vector<T>::iterator y) : values(x, y) {}
};
#if !defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP)
friend std::size_t hash_value(test_type3<T> const& x)
template <class T>
std::size_t hash_value(test_type3<T> const& x)
{
std::size_t seed = HASH_NAMESPACE::hash_range(x.values.begin(), x.values.end());
HASH_NAMESPACE::hash_range(seed, x.values.begin(), x.values.end());
return seed;
}
#endif
};
}
#if defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOPUP)
#if defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP)
namespace boost
{