Hash: Detab.

[SVN r81787]
This commit is contained in:
Daniel James
2012-12-08 09:19:24 +00:00
parent d0bcc1ef41
commit 8a0c516b22
3 changed files with 38 additions and 38 deletions

View File

@@ -15,49 +15,49 @@
#include "./compile_time.hpp" #include "./compile_time.hpp"
namespace test { namespace test {
enum enum_override { enum_override1, enum_override2 }; enum enum_override { enum_override1, enum_override2 };
std::size_t hash_value(enum_override) { return 896532; } std::size_t hash_value(enum_override) { return 896532; }
enum enum1 { enum1a }; enum enum1 { enum1a };
enum enum2 { enum2a, enum2b }; enum enum2 { enum2a, enum2b };
enum enum3 { enum3a = 574, enum3b }; enum enum3 { enum3a = 574, enum3b };
enum enum4 { enum4a = -12574, enum4b }; enum enum4 { enum4a = -12574, enum4b };
} }
int main() { int main() {
compile_time_tests((test::enum1*) 0); compile_time_tests((test::enum1*) 0);
compile_time_tests((test::enum2*) 0); compile_time_tests((test::enum2*) 0);
compile_time_tests((test::enum3*) 0); compile_time_tests((test::enum3*) 0);
compile_time_tests((test::enum4*) 0); compile_time_tests((test::enum4*) 0);
compile_time_tests((test::enum_override*) 0); compile_time_tests((test::enum_override*) 0);
HASH_NAMESPACE::hash<test::enum1> hash1; HASH_NAMESPACE::hash<test::enum1> hash1;
HASH_NAMESPACE::hash<test::enum2> hash2; HASH_NAMESPACE::hash<test::enum2> hash2;
HASH_NAMESPACE::hash<test::enum3> hash3; HASH_NAMESPACE::hash<test::enum3> hash3;
HASH_NAMESPACE::hash<test::enum4> hash4; HASH_NAMESPACE::hash<test::enum4> hash4;
BOOST_TEST(hash1(test::enum1a) == hash1(test::enum1a)); BOOST_TEST(hash1(test::enum1a) == hash1(test::enum1a));
BOOST_TEST(hash2(test::enum2a) == hash2(test::enum2a)); BOOST_TEST(hash2(test::enum2a) == hash2(test::enum2a));
BOOST_TEST(hash2(test::enum2a) != hash2(test::enum2b)); BOOST_TEST(hash2(test::enum2a) != hash2(test::enum2b));
BOOST_TEST(hash2(test::enum2b) == hash2(test::enum2b)); BOOST_TEST(hash2(test::enum2b) == hash2(test::enum2b));
BOOST_TEST(hash3(test::enum3a) == hash3(test::enum3a)); BOOST_TEST(hash3(test::enum3a) == hash3(test::enum3a));
BOOST_TEST(hash3(test::enum3a) != hash3(test::enum3b)); BOOST_TEST(hash3(test::enum3a) != hash3(test::enum3b));
BOOST_TEST(hash3(test::enum3b) == hash3(test::enum3b)); BOOST_TEST(hash3(test::enum3b) == hash3(test::enum3b));
BOOST_TEST(hash4(test::enum4a) == hash4(test::enum4a)); BOOST_TEST(hash4(test::enum4a) == hash4(test::enum4a));
BOOST_TEST(hash4(test::enum4a) != hash4(test::enum4b)); BOOST_TEST(hash4(test::enum4a) != hash4(test::enum4b));
BOOST_TEST(hash4(test::enum4b) == hash4(test::enum4b)); BOOST_TEST(hash4(test::enum4b) == hash4(test::enum4b));
HASH_NAMESPACE::hash<test::enum_override> hash_override; HASH_NAMESPACE::hash<test::enum_override> hash_override;
BOOST_TEST(hash_override(test::enum_override1) == BOOST_TEST(hash_override(test::enum_override1) ==
hash_override(test::enum_override1)); hash_override(test::enum_override1));
BOOST_TEST(hash_override(test::enum_override1) == BOOST_TEST(hash_override(test::enum_override1) ==
hash_override(test::enum_override2)); hash_override(test::enum_override2));
BOOST_TEST(hash_override(test::enum_override1) == BOOST_TEST(hash_override(test::enum_override1) ==
hash_override(test::enum_override1)); hash_override(test::enum_override1));
return boost::report_errors(); return boost::report_errors();
} }

View File

@@ -94,7 +94,7 @@ namespace boost
template <typename T> template <typename T>
typename boost::enable_if<boost::is_enum<T>, std::size_t>::type typename boost::enable_if<boost::is_enum<T>, std::size_t>::type
hash_value(T); hash_value(T);
#if !BOOST_WORKAROUND(__DMC__, <= 0x848) #if !BOOST_WORKAROUND(__DMC__, <= 0x848)
template <class T> std::size_t hash_value(T* const&); template <class T> std::size_t hash_value(T* const&);
@@ -187,9 +187,9 @@ namespace boost
template <typename T> template <typename T>
typename boost::enable_if<boost::is_enum<T>, std::size_t>::type typename boost::enable_if<boost::is_enum<T>, std::size_t>::type
hash_value(T v) hash_value(T v)
{ {
return static_cast<std::size_t>(v); return static_cast<std::size_t>(v);
} }
// Implementation by Alberto Barbati and Dave Harris. // Implementation by Alberto Barbati and Dave Harris.