Add address-model=32 tests to ci.yml

.appveyor.yml

@@ -29,10 +29,10 @@ environment:
       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
-#      ADDRMD: 64
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      TOOLSET: clang-win
+      CXXSTD: 14,17,latest
+      ADDRMD: 64
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       ADDPATH: C:\cygwin\bin;
       TOOLSET: gcc

.github/workflows/ci.yml

@@ -20,33 +20,43 @@ jobs:
           - toolset: gcc-4.8
             cxxstd: "03,11"
             os: ubuntu-18.04
-            install: g++-4.8
+            install: g++-4.8-multilib
+            address-model: 32,64
           - toolset: gcc-5
             cxxstd: "03,11,14,1z"
             os: ubuntu-18.04
-            install: g++-5
+            install: g++-5-multilib
+            address-model: 32,64
           - toolset: gcc-6
             cxxstd: "03,11,14,1z"
             os: ubuntu-18.04
-            install: g++-6
+            install: g++-6-multilib
+            address-model: 32,64
           - toolset: gcc-7
             cxxstd: "03,11,14,17"
             os: ubuntu-18.04
+            install: g++-7-multilib
+            address-model: 32,64
           - toolset: gcc-8
             cxxstd: "03,11,14,17,2a"
             os: ubuntu-18.04
-            install: g++-8
+            install: g++-8-multilib
+            address-model: 32,64
           - toolset: gcc-9
             cxxstd: "03,11,14,17,2a"
             os: ubuntu-20.04
+            install: g++-9-multilib
+            address-model: 32,64
           - toolset: gcc-10
             cxxstd: "03,11,14,17,2a"
             os: ubuntu-20.04
-            install: g++-10
+            install: g++-10-multilib
+            address-model: 32,64
           - toolset: gcc-11
             cxxstd: "03,11,14,17,20"
             os: ubuntu-20.04
-            install: g++-11
+            install: g++-11-multilib
+            address-model: 32,64
           - toolset: clang
             compiler: clang++-3.9
             cxxstd: "03,11,14"
@@ -137,7 +147,9 @@ jobs:
       - name: Run tests
         run: |
           cd ../boost-root
-          ./b2 -j3 libs/$LIBRARY/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} variant=debug,release
+          export ADDRMD=${{matrix.address-model}}
+          ./b2 -j3 --verbose-test libs/$LIBRARY/test//hash_info toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} ${ADDRMD:+address-model=$ADDRMD} variant=debug,release
+          ./b2 -j3 libs/$LIBRARY/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} ${ADDRMD:+address-model=$ADDRMD} variant=debug,release
 
   windows:
     strategy:
@@ -188,4 +200,5 @@ jobs:
         shell: cmd
         run: |
           cd ../boost-root
+          b2 -j3 --verbose-test libs/%LIBRARY%/test//hash_info toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} address-model=${{matrix.addrmd}} variant=debug,release
           b2 -j3 libs/%LIBRARY%/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} address-model=${{matrix.addrmd}} variant=debug,release

include/boost/container_hash/hash.hpp

@@ -308,7 +308,7 @@ namespace boost
              return seed;
         }
 
-        template<int Bits> struct hash_combine_impl
+        template<std::size_t Bits> struct hash_combine_impl
         {
             template <typename SizeT>
             inline static SizeT fn(SizeT seed, SizeT value)

test/Jamfile.v2

@@ -7,15 +7,14 @@ import testing ;
 
 project hash-tests
     : requirements
-        <warnings>all
+        <warnings>pedantic
         <toolset>intel:<warnings>on
-        #<toolset>intel:<cxxflags>-strict-ansi
-        <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow"
-        <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow"
-        <toolset>clang:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wsign-conversion -Wconversion -Wfloat-equal -Wshadow"
-        #<toolset>msvc:<warnings-as-errors>on
-        #<toolset>gcc:<warnings-as-errors>on
-        #<toolset>darwin:<warnings-as-errors>on
+        <toolset>gcc:<cxxflags>"-Wstrict-aliasing -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow"
+        <toolset>darwin:<cxxflags>"-Wstrict-aliasing -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow"
+        <toolset>clang:<cxxflags>"-Wstrict-aliasing -Wsign-promo -Wunused-parameter -Wsign-conversion -Wconversion -Wfloat-equal -Wshadow"
+        <toolset>msvc:<warnings-as-errors>on
+        <toolset>gcc:<warnings-as-errors>on
+        <toolset>clang:<warnings-as-errors>on
     ;
 
 test-suite container_hash/hash

test/check_float_funcs.cpp

@@ -3,6 +3,11 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#if defined(__GNUC__)
+// in type_traits/is_complete.hpp:47
+#pragma GCC diagnostic ignored "-Wconversion"
+#endif
+
 #include <boost/static_assert.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/is_convertible.hpp>

test/hash_complex_test.cpp

@@ -35,7 +35,7 @@ int main() {}
 #endif
 #endif
 
-#if defined(__GNUC__) && !defined(BOOST_INTEL_CXX_VERSION)
+#if ( defined(__GNUC__) || defined(__clang__) ) && !defined(BOOST_INTEL_CXX_VERSION)
 #pragma GCC diagnostic ignored "-Wfloat-equal"
 #endif
 

test/hash_float_test.hpp

@@ -30,7 +30,7 @@
 #endif
 #endif
 
-#if defined(__GNUC__) && !defined(BOOST_INTEL_CXX_VERSION)
+#if ( defined(__GNUC__) || defined(__clang__) ) && !defined(BOOST_INTEL_CXX_VERSION)
 #pragma GCC diagnostic ignored "-Wfloat-equal"
 #endif
 

test/hash_number_test.cpp

@@ -26,7 +26,7 @@
 #pragma warning(disable:4310) // cast truncates constant value
 #endif
 
-#if defined(__GNUC__) && !defined(BOOST_INTEL_CXX_VERSION)
+#if ( defined(__GNUC__) || defined(__clang__) ) && !defined(BOOST_INTEL_CXX_VERSION)
 #pragma GCC diagnostic ignored "-Wfloat-equal"
 #endif