Update hash_value for pointers to handle the case when uintptr_t is larger than size_t

examples/Jamfile.v2

@@ -6,4 +6,4 @@
 run books.cpp ;
 run point.cpp ;
 run portable.cpp ;
-run template.cpp ;
+run template.cpp : : : <toolset>msvc-8.0:<build>no ;

include/boost/container_hash/hash.hpp

@@ -77,11 +77,12 @@ namespace boost
     {
         template<class T,
             bool bigger_than_size_t = (sizeof(T) > sizeof(std::size_t)),
+            bool is_unsigned = boost::is_unsigned<T>::value,
             std::size_t size_t_bits = sizeof(std::size_t) * CHAR_BIT,
             std::size_t type_bits = sizeof(T) * CHAR_BIT>
         struct hash_integral_impl;
 
-        template<class T, std::size_t size_t_bits, std::size_t type_bits> struct hash_integral_impl<T, false, size_t_bits, type_bits>
+        template<class T, bool is_unsigned, std::size_t size_t_bits, std::size_t type_bits> struct hash_integral_impl<T, false, is_unsigned, size_t_bits, type_bits>
         {
             static std::size_t fn( T v )
             {
@@ -89,7 +90,24 @@ namespace boost
             }
         };
 
-        template<class T> struct hash_integral_impl<T, true, 32, 64>
+        template<class T, std::size_t size_t_bits, std::size_t type_bits> struct hash_integral_impl<T, true, false, size_t_bits, type_bits>
+        {
+            static std::size_t fn( T v )
+            {
+                typedef typename boost::make_unsigned<T>::type U;
+
+                if( v >= 0 )
+                {
+                    return hash_integral_impl<U>::fn( static_cast<U>( v ) );
+                }
+                else
+                {
+                    return ~hash_integral_impl<U>::fn( static_cast<U>( ~static_cast<U>( v ) ) );
+                }
+            }
+        };
+
+        template<class T> struct hash_integral_impl<T, true, true, 32, 64>
         {
             static std::size_t fn( T v )
             {
@@ -102,7 +120,7 @@ namespace boost
             }
         };
 
-        template<class T> struct hash_integral_impl<T, true, 32, 128>
+        template<class T> struct hash_integral_impl<T, true, true, 32, 128>
         {
             static std::size_t fn( T v )
             {
@@ -117,7 +135,7 @@ namespace boost
             }
         };
 
-        template<class T> struct hash_integral_impl<T, true, 64, 128>
+        template<class T> struct hash_integral_impl<T, true, true, 64, 128>
         {
             static std::size_t fn( T v )
             {
@@ -133,34 +151,32 @@ namespace boost
     } // namespace hash_detail
 
     template <typename T>
-    typename boost::enable_if_<boost::conjunction<boost::is_integral<T>, boost::is_unsigned<T> >::value, std::size_t>::type
+    typename boost::enable_if_<boost::is_integral<T>::value, std::size_t>::type
         hash_value( T v )
     {
         return hash_detail::hash_integral_impl<T>::fn( v );
     }
 
-    template <typename T>
-    typename boost::enable_if_<boost::conjunction<boost::is_integral<T>, boost::is_signed<T> >::value, std::size_t>::type
-        hash_value( T v )
-    {
-        typedef typename boost::make_unsigned<T>::type U;
-
-        if( v >= 0 )
-        {
-            return hash_value( static_cast<U>( v ) );
-        }
-        else
-        {
-            return ~hash_value( static_cast<U>( ~static_cast<U>( v ) ) );
-        }
-    }
-
     // enumeration types
 
     template <typename T>
     typename boost::enable_if_<boost::is_enum<T>::value, std::size_t>::type
         hash_value( T v )
     {
+        // This should in principle return the equivalent of
+        //
+        // boost::hash_value( to_underlying(v) );
+        //
+        // However, the C++03 implementation of underlying_type,
+        //
+        // conditional<is_signed<T>, make_signed<T>, make_unsigned<T>>::type::type
+        //
+        // generates a legitimate -Wconversion warning in is_signed,
+        // because -1 is not a valid enum value when all the enumerators
+        // are nonnegative.
+        //
+        // So the legacy implementation will have to do for now.
+
         return static_cast<std::size_t>( v );
     }
 
@@ -328,12 +344,11 @@ namespace boost
 
     // pointer types
 
-    // Implementation by Alberto Barbati and Dave Harris.
+    // `x + (x >> 3)` adjustment by Alberto Barbati and Dave Harris.
     template <class T> std::size_t hash_value( T* const& v )
     {
-        std::size_t x = static_cast<std::size_t>(
-           reinterpret_cast<boost::uintptr_t>(v));
-        return x + (x >> 3);
+        boost::uintptr_t x = reinterpret_cast<boost::uintptr_t>( v );
+        return boost::hash_value( x + (x >> 3) );
     }
 
     // array types