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

Change hash_detail::hash_range to take and return by value to avoid It=char* aliasing

Browse Source
This commit is contained in:
Peter Dimov
2022-09-17 01:09:47 +03:00
parent b4e0643ecd
commit e391cf6841
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
include/boost/container_hash/detail/hash_range.hpp
View File

@@ -8,6 +8,7 @@
#include <boost/container_hash/hash_fwd.hpp>
#include <boost/type_traits/integral_constant.hpp>
#include <boost/type_traits/enable_if.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/cstdint.hpp>
#include <cstddef>
#include <climits>
@@ -29,21 +30,25 @@ template<> struct is_char_type<unsigned char>: public boost::true_type {};
#endif
template<class It>
inline typename boost::enable_if_< !is_char_type<typename std::iterator_traits<It>::value_type>::value >::type
hash_range( std::size_t& seed, It first, It last )
inline typename boost::enable_if_<
!is_char_type<typename std::iterator_traits<It>::value_type>::value,
std::size_t >::type
hash_range( std::size_t seed, It first, It last )
{
for( ; first != last; ++first )
{
hash_combine<typename std::iterator_traits<It>::value_type>( seed, *first );
}
return seed;
}
template<class It>
inline typename boost::enable_if_<
is_char_type<typename std::iterator_traits<It>::value_type>::value &&
is_same<typename std::iterator_traits<It>::iterator_category, std::random_access_iterator_tag>::value
>::type
hash_range( std::size_t& seed, It first, It last )
is_same<typename std::iterator_traits<It>::iterator_category, std::random_access_iterator_tag>::value,
std::size_t>::type
hash_range( std::size_t seed, It first, It last )
{
std::size_t n = static_cast<std::size_t>( last - first );
@@ -99,14 +104,16 @@ inline typename boost::enable_if_<
hash_combine( seed, w );
}
return seed;
}
template<class It>
inline typename boost::enable_if_<
is_char_type<typename std::iterator_traits<It>::value_type>::value &&
!is_same<typename std::iterator_traits<It>::iterator_category, std::random_access_iterator_tag>::value
>::type
hash_range( std::size_t& seed, It first, It last )
!is_same<typename std::iterator_traits<It>::iterator_category, std::random_access_iterator_tag>::value,
std::size_t>::type
hash_range( std::size_t seed, It first, It last )
{
for( ;; )
{
@@ -115,7 +122,7 @@ inline typename boost::enable_if_<
if( first == last )
{
hash_combine( seed, w | 0x01u );
return;
return seed;
}
w |= static_cast<boost::uint32_t>( static_cast<unsigned char>( *first ) );
@@ -124,7 +131,7 @@ inline typename boost::enable_if_<
if( first == last )
{
hash_combine( seed, w | 0x0100u );
return;
return seed;
}
w |= static_cast<boost::uint32_t>( static_cast<unsigned char>( *first ) ) << 8;
@@ -133,7 +140,7 @@ inline typename boost::enable_if_<
if( first == last )
{
hash_combine( seed, w | 0x010000u );
return;
return seed;
}
w |= static_cast<boost::uint32_t>( static_cast<unsigned char>( *first ) ) << 16;
@@ -142,7 +149,7 @@ inline typename boost::enable_if_<
if( first == last )
{
hash_combine( seed, w | 0x01000000u );
return;
return seed;
}
w |= static_cast<boost::uint32_t>( static_cast<unsigned char>( *first ) ) << 24;

2
include/boost/container_hash/hash.hpp
View File

@@ -560,7 +560,7 @@ namespace boost
template <class It>
inline void hash_range( std::size_t& seed, It first, It last )
{
hash_detail::hash_range( seed, first, last );
seed = hash_detail::hash_range( seed, first, last );
}
template <class It>