boostorg/functional
1
0
Fork 1
mirror of https://github.com/boostorg/functional.git synced 2025-08-02 22:14:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Since all the hash functions are now declared in a single header, there's no

Browse Source 
need for the call_hash hack on compliant compilers. So only use it on
compilers where it's needed.


[SVN r32781]
This commit is contained in:
Daniel James
2006-02-09 19:10:03 +00:00
parent 534d526c90
commit a5844bc9bf
1 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
include/boost/functional/hash/hash.hpp
View File

@@ -113,25 +113,9 @@ namespace boost
return x + (x >> 3);
}
#if defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
namespace hash_detail
{
#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
// This allows boost::hash to be specialised for classes in the
// standard namespace. It appears that a strict two phase template
// implementation only finds overloads that are in the current
// namespace at the point of definition (at instantiation
// it only finds new overloads via. ADL on the dependant paramters or
// something like that).
template <class T>
struct call_hash
{
static std::size_t call(T const& v)
{
using namespace boost;
return hash_value(v);
}
};
#else // BOOST_NO_FUNCTION_TEMPLATE_ORDERING
template <bool IsArray>
struct call_hash_impl
{
@@ -170,8 +154,8 @@ namespace boost
::BOOST_NESTED_TEMPLATE inner<T>
{
};
#endif // BOOST_NO_FUNCTION_TEMPLATE_ORDERING
}
#endif // BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
template <class T>
@@ -181,8 +165,8 @@ namespace boost
inline void hash_combine(std::size_t& seed, T const& v)
#endif
{
seed ^= hash_detail::call_hash<T>::call(v)
+ 0x9e3779b9 + (seed<<6) + (seed>>2);
boost::hash<T> hasher;
seed ^= hasher(v) + 0x9e3779b9 + (seed<<6) + (seed>>2);
}
template <class It>
@@ -215,8 +199,8 @@ namespace boost
for(; first != last; ++first)
{
seed ^= hash_detail::call_hash<T>::call(*first)
+ 0x9e3779b9 + (seed<<6) + (seed>>2);
boost::hash<T> hasher;
seed ^= hasher(*first) + 0x9e3779b9 + (seed<<6) + (seed>>2);
}
return seed;
@@ -227,8 +211,8 @@ namespace boost
{
for(; first != last; ++first)
{
seed ^= hash_detail::call_hash<T>::call(*first)
+ 0x9e3779b9 + (seed<<6) + (seed>>2);
boost::hash<T> hasher;
seed ^= hasher(*first) + 0x9e3779b9 + (seed<<6) + (seed>>2);
}
}
#endif
@@ -329,6 +313,12 @@ namespace boost
template <class T> struct hash
: std::unary_function<T, std::size_t>
{
#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
std::size_t operator()(T const& val) const
{
return hash_value(val);
}
#else
std::size_t operator()(T const& val) const
{
return hash_detail::call_hash<T>::call(val);
@@ -339,6 +329,7 @@ namespace boost
{
return hash_detail::call_hash<T>::call(val);
}
#endif
#endif
};
}