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

New attempt at fixing the function pointer hash on the Sun compilers.

Browse Source 
I think I was barking up the wrong tree - it could be that when calling
hash_value with a function pointer the compiler was choosing the
hash_value(bool) overload over the hash_value(T*) overload, so instead I'm
trying to call the correct one by giving it a template parameter. Another
alternative would be to calculate the hash function inside boost::hash.

Unfortunately, if I'm right, this means that other calls to hash_value will go
wrong for function pointers.


[SVN r39972]
This commit is contained in:
Daniel James
2007-10-13 16:34:09 +00:00
parent cd2d453735
commit d6a5c9c435
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,10 +28,6 @@
#include <boost/type_traits/is_const.hpp> #include <boost/type_traits/is_const.hpp>
#endif #endif
#if BOOST_WORKAROUND(__SUNPRO_CC, <= 0x590)
#include <boost/type_traits/is_function.hpp>
#endif
namespace boost namespace boost
{ {
std::size_t hash_value(bool); std::size_t hash_value(bool);
@@ -213,15 +209,9 @@ namespace boost
template <class T> std::size_t hash_value(T* v) template <class T> std::size_t hash_value(T* v)
#endif #endif
{ {
#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 0x590)
std::size_t x = static_cast<std::size_t>( std::size_t x = static_cast<std::size_t>(
reinterpret_cast<std::ptrdiff_t>(v)); reinterpret_cast<std::ptrdiff_t>(v));
#else
std::size_t x = static_cast<std::size_t>(
boost::is_function<T>::value ?
reinterpret_cast<std::ptrdiff_t>((void*) v) :
reinterpret_cast<std::ptrdiff_t>(v));
#endif
return x + (x >> 3); return x + (x >> 3);
} }
@@ -475,10 +465,14 @@ namespace boost
struct hash<T*> struct hash<T*>
: public std::unary_function<T*, std::size_t> : public std::unary_function<T*, std::size_t>
{ {
std::size_t operator()(T* v) const \ std::size_t operator()(T* v) const
{ \ {
return boost::hash_value(v); \ #if !BOOST_WORKAROUND(__SUNPRO_CC, <= 0x590)
} \ return boost::hash_value(v);
#else
return boost::hash_value<T*>(v);
#endif
}
}; };
#else #else
namespace hash_detail namespace hash_detail
@@ -495,7 +489,11 @@ namespace boost
{ {
std::size_t operator()(T val) const std::size_t operator()(T val) const
{ {
#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 590)
return boost::hash_value(val); return boost::hash_value(val);
#else
return boost::hash_value<T>(val);
#endif
} }
}; };
}; };