Only define wxIntegerHash::longlongHash when long long isn't long
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -460,11 +460,13 @@ class WXDLLIMPEXP_BASE wxIntegerHash
|
|||||||
WX_HASH_MAP_NAMESPACE::hash<short> shortHash;
|
WX_HASH_MAP_NAMESPACE::hash<short> shortHash;
|
||||||
WX_HASH_MAP_NAMESPACE::hash<unsigned short> ushortHash;
|
WX_HASH_MAP_NAMESPACE::hash<unsigned short> ushortHash;
|
||||||
|
|
||||||
|
#if defined wxLongLong_t && !defined wxLongLongIsLong
|
||||||
size_t longlongHash( wxLongLong_t x ) const
|
size_t longlongHash( wxLongLong_t x ) const
|
||||||
{
|
{
|
||||||
return longHash( wx_truncate_cast(long, x) ) ^
|
return longHash( wx_truncate_cast(long, x) ) ^
|
||||||
longHash( wx_truncate_cast(long, x >> (sizeof(long) * 8)) );
|
longHash( wx_truncate_cast(long, x >> (sizeof(long) * 8)) );
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
public:
|
public:
|
||||||
wxIntegerHash() { }
|
wxIntegerHash() { }
|
||||||
|
Reference in New Issue
Block a user