Simplify and generalize hash_integral_impl

.appveyor.yml

@@ -25,10 +25,10 @@ environment:
       TOOLSET: msvc-14.1
       CXXSTD: 14,17
       ADDRMD: 32,64
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      TOOLSET: clang-win
-      ADDRMD: 64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      TOOLSET: msvc-14.2
       CXXSTD: 14,17,latest
+      ADDRMD: 32,64
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
       TOOLSET: clang-win
       CXXSTD: 14,17,latest

.github/workflows/ci.yml

@@ -121,7 +121,7 @@ jobs:
             install: clang-14
           - toolset: clang
             cxxstd: "03,11,14,17,2a"
-            os: macos-11
+            os: macos-10.15
 
     runs-on: ${{matrix.os}}
 
@@ -234,7 +234,7 @@ jobs:
           - os: ubuntu-18.04
           - os: ubuntu-20.04
           - os: ubuntu-22.04
-          - os: macos-11
+          - os: macos-10.15
 
     runs-on: ${{matrix.os}}
 
@@ -281,7 +281,7 @@ jobs:
           - os: ubuntu-18.04
           - os: ubuntu-20.04
           - os: ubuntu-22.04
-          - os: macos-11
+          - os: macos-10.15
 
     runs-on: ${{matrix.os}}
 
@@ -338,7 +338,7 @@ jobs:
           - os: ubuntu-18.04
           - os: ubuntu-20.04
           - os: ubuntu-22.04
-          - os: macos-11
+          - os: macos-10.15
 
     runs-on: ${{matrix.os}}
 

examples/Jamfile.v2

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

include/boost/container_hash/hash.hpp

@@ -1,5 +1,6 @@
 // Copyright 2005-2014 Daniel James.
 // Copyright 2021 Peter Dimov.
+// Copyright 2022 Glen Joseph Fernandes (glenjofe@gmail.com)
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
@@ -78,11 +79,10 @@ 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>
+            std::size_t blocks = sizeof(T) / sizeof(std::size_t)>
         struct hash_integral_impl;
 
-        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>
+        template<class T, bool is_unsigned, std::size_t blocks> struct hash_integral_impl<T, false, is_unsigned, blocks>
         {
             static std::size_t fn( T v )
             {
@@ -90,7 +90,7 @@ namespace boost
             }
         };
 
-        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>
+        template<class T, std::size_t blocks> struct hash_integral_impl<T, true, false, blocks>
         {
             static std::size_t fn( T v )
             {
@@ -107,41 +107,36 @@ namespace boost
             }
         };
 
-        template<class T> struct hash_integral_impl<T, true, true, 32, 64>
+        template<class T> struct hash_integral_impl<T, true, true, 2>
         {
             static std::size_t fn( T v )
             {
+                enum {
+                    M = sizeof(std::size_t) * CHAR_BIT
+                };
                 std::size_t seed = 0;
 
-                seed ^= static_cast<std::size_t>( v >> 32 ) + ( seed << 6 ) + ( seed >> 2 );
+                seed ^= static_cast<std::size_t>( v >> M ) + ( seed << 6 ) + ( seed >> 2 );
                 seed ^= static_cast<std::size_t>( v ) + ( seed << 6 ) + ( seed >> 2 );
 
                 return seed;
             }
         };
 
-        template<class T> struct hash_integral_impl<T, true, true, 32, 128>
+        template<class T> struct hash_integral_impl<T, true, true, 4>
         {
             static std::size_t fn( T v )
             {
+                enum {
+                    M1 = sizeof(std::size_t) * CHAR_BIT,
+                    M2 = M1 + M1,
+                    M3 = M2 + M1
+                };
                 std::size_t seed = 0;
 
-                seed ^= static_cast<std::size_t>( v >> 96 ) + ( seed << 6 ) + ( seed >> 2 );
-                seed ^= static_cast<std::size_t>( v >> 64 ) + ( seed << 6 ) + ( seed >> 2 );
-                seed ^= static_cast<std::size_t>( v >> 32 ) + ( seed << 6 ) + ( seed >> 2 );
-                seed ^= static_cast<std::size_t>( v ) + ( seed << 6 ) + ( seed >> 2 );
-
-                return seed;
-            }
-        };
-
-        template<class T> struct hash_integral_impl<T, true, true, 64, 128>
-        {
-            static std::size_t fn( T v )
-            {
-                std::size_t seed = 0;
-
-                seed ^= static_cast<std::size_t>( v >> 64 ) + ( seed << 6 ) + ( seed >> 2 );
+                seed ^= static_cast<std::size_t>( v >> M3 ) + ( seed << 6 ) + ( seed >> 2 );
+                seed ^= static_cast<std::size_t>( v >> M2 ) + ( seed << 6 ) + ( seed >> 2 );
+                seed ^= static_cast<std::size_t>( v >> M1 ) + ( seed << 6 ) + ( seed >> 2 );
                 seed ^= static_cast<std::size_t>( v ) + ( seed << 6 ) + ( seed >> 2 );
 
                 return seed;
@@ -163,20 +158,6 @@ namespace boost
     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 );
     }
 
@@ -344,11 +325,12 @@ namespace boost
 
     // pointer types
 
-    // `x + (x >> 3)` adjustment by Alberto Barbati and Dave Harris.
+    // Implementation by Alberto Barbati and Dave Harris.
     template <class T> std::size_t hash_value( T* const& v )
     {
-        boost::uintptr_t x = reinterpret_cast<boost::uintptr_t>( v );
-        return boost::hash_value( x + (x >> 3) );
+        std::size_t x = static_cast<std::size_t>(
+           reinterpret_cast<boost::uintptr_t>(v));
+        return x + (x >> 3);
     }
 
     // array types
@@ -417,7 +399,7 @@ namespace boost
         return boost::hash_unordered_range( v.begin(), v.end() );
     }
 
-#if defined(_MSVC_STL_VERSION) && _MSVC_STL_VERSION == 141 && BOOST_CXX_VERSION >= 201700L
+#if defined(BOOST_MSVC) && BOOST_MSVC >= 1910 && BOOST_MSVC < 1920 && BOOST_CXX_VERSION >= 201700L
 
     // resolve ambiguity with unconstrained stdext::hash_value in <xhash> :-/
 
@@ -670,7 +652,7 @@ namespace boost
         }
     };
 
-#if defined(_MSVC_STL_VERSION) && _MSVC_STL_VERSION == 141 && BOOST_CXX_VERSION >= 201700L
+#if defined(BOOST_MSVC) && BOOST_MSVC >= 1910 && BOOST_MSVC < 1920 && BOOST_CXX_VERSION >= 201700L
 
     // msvc-14.1 has stdext::hash_value for basic_string in <xhash> :-/
 

test/Jamfile.v2

@@ -81,8 +81,3 @@ run hash_fs_path_test.cpp /boost//filesystem/<warnings>off : : : $(fs-path-req)
 run detail_is_range_test2.cpp : : : $(fs-path-req) ;
 
 run hash_container_test.cpp ;
-
-run hash_vector_test2.cpp ;
-
-run hash_string_test3.cpp ;
-run hash_string_test4.cpp ;

test/hash_string_test3.cpp

@@ -1,42 +0,0 @@
-// Copyright 2021, 2022 Peter Dimov.
-// Distributed under the Boost Software License, Version 1.0.
-// https://www.boost.org/LICENSE_1_0.txt
-
-#include <boost/container_hash/hash.hpp>
-#include <boost/core/lightweight_test.hpp>
-#include <string>
-
-void test( unsigned char ch )
-{
-    typedef boost::hash<std::string> hash;
-
-    int const N = 32;
-
-    std::size_t h[ N ];
-
-    std::string v;
-
-    for( int i = 0; i < N; ++i )
-    {
-        h[ i ] = hash()( v );
-
-        BOOST_TEST_EQ( h[ i ], hash()( v ) );
-
-        for( int j = 0; j < i; ++j )
-        {
-            BOOST_TEST_NE( h[ j ], h[ i ] );
-        }
-
-        v.push_back( static_cast<char>( ch ) );
-    }
-}
-
-int main()
-{
-    for( unsigned ch = 0; ch < 256; ++ch )
-    {
-        test( static_cast<unsigned char>( ch ) );
-    }
-
-    return boost::report_errors();
-}

test/hash_string_test4.cpp

@@ -1,41 +0,0 @@
-// Copyright 2021, 2022 Peter Dimov.
-// Distributed under the Boost Software License, Version 1.0.
-// https://www.boost.org/LICENSE_1_0.txt
-
-#include <boost/container_hash/hash.hpp>
-#include <boost/core/lightweight_test.hpp>
-#include <string>
-#include <cstddef>
-
-void test( std::size_t n, unsigned char ch )
-{
-    typedef boost::hash<std::string> hash;
-
-    std::string const v( n, static_cast<char>( ch ) );
-
-    for( std::size_t i = 0; i < n * 8; ++i )
-    {
-        std::string w( v );
-
-        unsigned char ch2 = static_cast<unsigned char>( w[ i / 8 ] );
-
-        ch2 = static_cast<unsigned char>( ch2 ^ ( 1 << ( i % 8 ) ) );
-
-        w[ i / 8 ] = static_cast<char>( ch2 );
-
-        BOOST_TEST_NE( hash()( v ), hash()( w ) );
-    }
-}
-
-int main()
-{
-    for( unsigned ch = 0; ch < 256; ++ch )
-    {
-        for( std::size_t n = 1; n < 32; ++n )
-        {
-            test( n, static_cast<unsigned char>( ch ) );
-        }
-    }
-
-    return boost::report_errors();
-}

test/hash_vector_test2.cpp

@@ -1,48 +0,0 @@
-// Copyright 2021, 2022 Peter Dimov.
-// Distributed under the Boost Software License, Version 1.0.
-// https://www.boost.org/LICENSE_1_0.txt
-
-#if defined(__GNUC__) && __GNUC__ == 8
-# pragma GCC diagnostic ignored "-Wsign-conversion"
-#endif
-
-#include <boost/container_hash/hash.hpp>
-#include <boost/core/lightweight_test.hpp>
-#include <vector>
-#include <functional> // to catch msvc-14.1 conflicts
-
-template<class T> void test()
-{
-    typedef std::vector<T> list;
-    typedef boost::hash<list> hash;
-
-    int const N = 32;
-
-    std::size_t h[ N ];
-
-    list v;
-
-    for( int i = 0; i < N; ++i )
-    {
-        h[ i ] = hash()( v );
-
-        BOOST_TEST_EQ( h[ i ], hash()( v ) );
-
-        for( int j = 0; j < i; ++j )
-        {
-            BOOST_TEST_NE( h[ j ], h[ i ] );
-        }
-
-        v.push_back( T() );
-    }
-}
-
-int main()
-{
-    test<int>();
-    test<float>();
-    test<double>();
-    test< std::vector<int> >();
-
-    return boost::report_errors();
-}