Merge branch 'feature/hash-is-avalanching-test-03' into develop

This commit is contained in:
Peter Dimov
2022-10-30 21:13:29 +02:00
2 changed files with 9 additions and 8 deletions

View File

@ -12,7 +12,7 @@
#define BOOST_UNORDERED_HASH_TRAITS_HPP #define BOOST_UNORDERED_HASH_TRAITS_HPP
#include <boost/type_traits/make_void.hpp> #include <boost/type_traits/make_void.hpp>
#include <type_traits> #include <boost/type_traits/integral_constant.hpp>
namespace boost{ namespace boost{
namespace unordered{ namespace unordered{
@ -20,11 +20,12 @@ namespace unordered{
namespace detail{ namespace detail{
template<typename Hash,typename=void> template<typename Hash,typename=void>
struct hash_is_avalanching_impl:std::false_type{}; struct hash_is_avalanching_impl: boost::false_type{};
template<typename Hash> template<typename Hash>
struct hash_is_avalanching_impl<Hash,void_t<typename Hash::is_avalanching>>: struct hash_is_avalanching_impl<Hash,
std::true_type{}; typename boost::make_void<typename Hash::is_avalanching>::type>:
boost::true_type{};
} /* namespace detail */ } /* namespace detail */
@ -32,11 +33,11 @@ struct hash_is_avalanching_impl<Hash,void_t<typename Hash::is_avalanching>>:
* when actual characterization differs from default. * when actual characterization differs from default.
*/ */
/* Derived from std::true_type if the type Hash::is_avalanching is present, /* hash_is_avalanching<Hash>::value is true when the type Hash::is_avalanching
* derived from std::false_type otherwise. * is present, false otherwise.
*/ */
template<typename Hash> template<typename Hash>
struct hash_is_avalanching:detail::hash_is_avalanching_impl<Hash>::type{}; struct hash_is_avalanching: detail::hash_is_avalanching_impl<Hash>::type{};
} /* namespace unordered */ } /* namespace unordered */
} /* namespace boost */ } /* namespace boost */

View File

@ -139,7 +139,7 @@ build_foa erase_if ;
build_foa scary_tests ; build_foa scary_tests ;
build_foa init_type_insert_tests ; build_foa init_type_insert_tests ;
run unordered/hash_is_avalanching_test.cpp : : : $(CPP11) ; run unordered/hash_is_avalanching_test.cpp ;
run exception/constructor_exception_tests.cpp : : : $(CPP11) <define>BOOST_UNORDERED_FOA_TESTS : foa_constructor_exception_tests ; run exception/constructor_exception_tests.cpp : : : $(CPP11) <define>BOOST_UNORDERED_FOA_TESTS : foa_constructor_exception_tests ;
run exception/copy_exception_tests.cpp : : : $(CPP11) <define>BOOST_UNORDERED_FOA_TESTS : foa_copy_exception_tests ; run exception/copy_exception_tests.cpp : : : $(CPP11) <define>BOOST_UNORDERED_FOA_TESTS : foa_copy_exception_tests ;