AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use hash<long> instead of hash<wxLongLong_t> when they are the same size

Browse Source 
since even some 64-bit compilers have a problem with it, it seems.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell 2006-11-03 21:32:39 +00:00
parent 01df01eb19
commit b158be6e47
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/hashmap.h
View File

@ -465,14 +465,16 @@ class WXDLLIMPEXP_BASE wxIntegerHash
WX_HASH_MAP_NAMESPACE::hash<unsigned short> ushortHash; WX_HASH_MAP_NAMESPACE::hash<unsigned short> ushortHash;
#if defined wxLongLong_t && !defined wxLongLongIsLong #if defined wxLongLong_t && !defined wxLongLongIsLong
// hash<wxLongLong_t> ought to work, but some 32-bit compilers have been // hash<wxLongLong_t> ought to work but doesn't on some compilers
// found where the hash doesn't work with 64-bit values. #if (!defined SIZEOF_LONG_LONG && SIZEOF_LONG == 4) \
#if SIZEOF_LONG == 4 && (!defined SIZEOF_LONG_LONG || SIZEOF_LONG_LONG == 8) || (defined SIZEOF_LONG_LONG && SIZEOF_LONG_LONG == SIZEOF_LONG * 2)
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)) );
} }
#elif defined SIZEOF_LONG_LONG && SIZEOF_LONG_LONG == SIZEOF_LONG
WX_HASH_MAP_NAMESPACE::hash<long> longlongHash;
#else #else
WX_HASH_MAP_NAMESPACE::hash<wxLongLong_t> longlongHash; WX_HASH_MAP_NAMESPACE::hash<wxLongLong_t> longlongHash;
#endif #endif