Rename id to id_ to avoid ObjC++ parsing issues. Fixes #52.

This commit is contained in:
Peter Dimov
2020-01-18 22:15:44 +02:00
parent d9bfbfc4d4
commit 7ba160e443

View File

@ -783,11 +783,11 @@ inline std::size_t hash_value( error_code const & ec )
{ {
error_category const & cat = ec.category(); error_category const & cat = ec.category();
boost::ulong_long_type id = cat.id_; boost::ulong_long_type id_ = cat.id_;
if( id == 0 ) if( id_ == 0 )
{ {
id = reinterpret_cast<boost::uintptr_t>( &cat ); id_ = reinterpret_cast<boost::uintptr_t>( &cat );
} }
boost::ulong_long_type hv = ( boost::ulong_long_type( 0xCBF29CE4 ) << 32 ) + 0x84222325; boost::ulong_long_type hv = ( boost::ulong_long_type( 0xCBF29CE4 ) << 32 ) + 0x84222325;
@ -795,7 +795,7 @@ inline std::size_t hash_value( error_code const & ec )
// id // id
hv ^= id; hv ^= id_;
hv *= prime; hv *= prime;
// value // value