Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This commit was manufactured by cvs2svn to create tag 'wxPy_2_6_3_3'.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/wxPy_2_6_3_3@40115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2006-07-16 07:00:28 +00:00
parent 219ee9ba9d
commit 3af18ac68c
2178 changed files with 231496 additions and 259769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
include/wx/hashmap.h
View File

@@ -341,8 +341,8 @@ protected: \
/* returns NULL if not found */ \
Node** GetNodePtr( const const_key_type& key ) const \
{ \
unsigned long hash = wx_static_cast(unsigned long, m_hasher( key )); \
Node** node = &m_table[hash % m_tableBuckets]; \
size_t bucket = m_hasher( key ) % m_tableBuckets; \
Node** node = &m_table[bucket]; \
\
while( *node ) \
{ \
@@ -358,8 +358,8 @@ protected: \
/* expressing it in terms of GetNodePtr is 5-8% slower :-( */ \
Node* GetNode( const const_key_type& key ) const \
{ \
unsigned long hash = wx_static_cast(unsigned long, m_hasher( key )); \
Node* node = m_table[hash % m_tableBuckets]; \
size_t bucket = m_hasher( key ) % m_tableBuckets; \
Node* node = m_table[bucket]; \
\
while( node ) \
{ \
@@ -465,6 +465,15 @@ class WXDLLIMPEXP_BASE wxIntegerHash
WX_HASH_MAP_NAMESPACE::hash<unsigned int> uintHash;
WX_HASH_MAP_NAMESPACE::hash<short> shortHash;
WX_HASH_MAP_NAMESPACE::hash<unsigned short> ushortHash;
#if defined wxLongLong_t && !defined wxLongLongIsLong
size_t longlongHash( wxLongLong_t x ) const
{
return longHash( wx_truncate_cast(long, x) ) ^
longHash( wx_truncate_cast(long, x >> (sizeof(long) * 8)) );
}
#endif
public:
wxIntegerHash() { }
size_t operator()( long x ) const { return longHash( x ); }
@@ -473,6 +482,10 @@ public:
size_t operator()( unsigned int x ) const { return uintHash( x ); }
size_t operator()( short x ) const { return shortHash( x ); }
size_t operator()( unsigned short x ) const { return ushortHash( x ); }
#if defined wxLongLong_t && !defined wxLongLongIsLong
size_t operator()( wxLongLong_t x ) const { return longlongHash(x); }
size_t operator()( wxULongLong_t x ) const { return longlongHash(x); }
#endif
wxIntegerHash& operator=(const wxIntegerHash&) { return *this; }
};
@@ -490,6 +503,10 @@ public:
unsigned long operator()( unsigned int x ) const { return x; }
unsigned long operator()( short x ) const { return (unsigned long)x; }
unsigned long operator()( unsigned short x ) const { return x; }
#if defined wxLongLong_t && !defined wxLongLongIsLong
wxULongLong_t operator()( wxLongLong_t x ) const { return wx_static_cast(wxULongLong_t, x); }
wxULongLong_t operator()( wxULongLong_t x ) const { return x; }
#endif
wxIntegerHash& operator=(const wxIntegerHash&) { return *this; }
};
@@ -506,6 +523,10 @@ public:
bool operator()( unsigned int a, unsigned int b ) const { return a == b; }
bool operator()( short a, short b ) const { return a == b; }
bool operator()( unsigned short a, unsigned short b ) const { return a == b; }
#if defined wxLongLong_t && !defined wxLongLongIsLong
bool operator()( wxLongLong_t a, wxLongLong_t b ) const { return a == b; }
bool operator()( wxULongLong_t a, wxULongLong_t b ) const { return a == b; }
#endif
wxIntegerEqual& operator=(const wxIntegerEqual&) { return *this; }
};