boostorg/system
1
0
Fork 1
mirror of https://github.com/boostorg/system.git synced 2025-07-30 12:37:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix hash_value

Browse Source
This commit is contained in:
Peter Dimov
2018-09-17 18:18:37 +03:00
parent 11b07164c1
commit 11a908a3fe
2 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
include/boost/system/error_code.hpp
View File

@ -162,8 +162,14 @@ template<> struct is_error_condition_enum<errc::errc_t>
#pragma warning( disable: 4355 ) #pragma warning( disable: 4355 )
#endif #endif
std::size_t hash_value( error_code const & ec );
class BOOST_SYMBOL_VISIBLE error_category class BOOST_SYMBOL_VISIBLE error_category
{ {
private:
friend std::size_t hash_value( error_code const & ec );
#if !defined(BOOST_NO_CXX11_DELETED_FUNCTIONS) #if !defined(BOOST_NO_CXX11_DELETED_FUNCTIONS)
public: public:
@ -692,10 +698,31 @@ template <class charT, class traits>
return os; return os;
} }
inline std::size_t hash_value( const error_code & ec ) inline std::size_t hash_value( error_code const & ec )
{ {
// TODO use category id_, FNV combiner error_category const & cat = ec.category();
return static_cast<std::size_t>( ec.value() ) + reinterpret_cast<std::size_t>( &ec.category() );
boost::ulong_long_type id = cat.id_;
if( id == 0 )
{
id = reinterpret_cast<boost::ulong_long_type>( &cat );
}
boost::ulong_long_type hv = 0xCBF29CE484222325ull;
boost::ulong_long_type const prime = 0x00000100000001B3ull;
// id
hv ^= id;
hv *= prime;
// value
hv ^= static_cast<unsigned>( ec.value() );
hv *= prime;
return static_cast<std::size_t>( hv );
} }
// make_* functions for errc::errc_t // make_* functions for errc::errc_t

19
test/single_instance_test.cpp
View File

@ -25,8 +25,23 @@ error_code get_generic_code();
int main() int main()
{ {
BOOST_TEST_EQ( lib1::get_system_code(), lib2::get_system_code() ); {
BOOST_TEST_EQ( lib1::get_generic_code(), lib2::get_generic_code() ); error_code e1 = lib1::get_system_code();
error_code e2 = lib2::get_system_code();
BOOST_TEST_EQ( e1, e2 );
BOOST_TEST_EQ( hash_value( e1 ), hash_value( e2 ) );
}
{
error_code e1 = lib1::get_generic_code();
error_code e2 = lib2::get_generic_code();
BOOST_TEST_EQ( e1, e2 );
BOOST_TEST_EQ( hash_value( e1 ), hash_value( e2 ) );
}
return boost::report_errors(); return boost::report_errors();
} }