Committed Jaako's renderer patch

[wxWidgets.git] / include / wx / hashmap.h

diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h
index 7e20a9abc2c1cb9da66df23dd20e8f9964d61485..14e5619e6a9563f72ccf3213214865f742785447 100644 (file)
--- a/include/wx/hashmap.h
+++ b/include/wx/hashmap.h
@@ -12,10 +12,6 @@
 #ifndef _WX_HASHMAP_H_
 #define _WX_HASHMAP_H_
 
 #ifndef _WX_HASHMAP_H_
 #define _WX_HASHMAP_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "hashmap.h"
-#endif
-

 #include "wx/string.h"
 
 #if (defined(HAVE_EXT_HASH_MAP) || defined(HAVE_HASH_MAP)) \
 #include "wx/string.h"
 
 #if (defined(HAVE_EXT_HASH_MAP) || defined(HAVE_HASH_MAP)) \


@@ -38,7 +34,7 @@
 #endif
 
 #define _WX_DECLARE_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP ) \
 #endif
 
 #define _WX_DECLARE_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP ) \

-    typedef WX_HASH_MAP_NAMESPACE::hash_map< KEY_T, VALUE_T, HASH_T, KEY_EQ_T > CLASSNAME;
+    typedef WX_HASH_MAP_NAMESPACE::hash_map< KEY_T, VALUE_T, HASH_T, KEY_EQ_T > CLASSNAME

 
 #else // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
 
 
 #else // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
 


@@ -101,10 +97,10 @@ protected:
     {
         return (void **)calloc(sz, sizeof(void*));
     }
     {
         return (void **)calloc(sz, sizeof(void*));
     }

-       static void FreeTable(void *table)
-       {
-               free(table);
-       }
+    static void FreeTable(void *table)
+    {
+        free(table);
+    }

 };
 
 #define _WX_DECLARE_HASHTABLE( VALUE_T, KEY_T, HASH_T, KEY_EX_T, KEY_EQ_T, CLASSNAME, CLASSEXP, SHOULD_GROW, SHOULD_SHRINK ) \
 };
 
 #define _WX_DECLARE_HASHTABLE( VALUE_T, KEY_T, HASH_T, KEY_EX_T, KEY_EQ_T, CLASSNAME, CLASSEXP, SHOULD_GROW, SHOULD_SHRINK ) \


@@ -341,25 +337,26 @@ protected: \
     /* returns NULL if not found */ \
     Node** GetNodePtr( const const_key_type& key ) const \
     { \
     /* returns NULL if not found */ \
     Node** GetNodePtr( const const_key_type& key ) const \
     { \

-        unsigned long hash = 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 ) \
         { \
             if( m_equals( m_getKey( (*node)->m_value ), key ) ) \
                 return node; \
  \
         while( *node ) \
         { \
             if( m_equals( m_getKey( (*node)->m_value ), key ) ) \
                 return node; \

+            /* Tell the compiler to not do any strict-aliasing assumptions with a void cast? Can we make such a runtime guarantee? */ \

             node = (Node**)&(*node)->m_nxt; \
         } \
  \
             node = (Node**)&(*node)->m_nxt; \
         } \
  \

-        return 0; \
+        return NULL; \

     } \
  \
     /* returns NULL if not found */ \
     /* expressing it in terms of GetNodePtr is 5-8% slower :-( */ \
     Node* GetNode( const const_key_type& key ) const \
     { \
     } \
  \
     /* returns NULL if not found */ \
     /* expressing it in terms of GetNodePtr is 5-8% slower :-( */ \
     Node* GetNode( const const_key_type& key ) const \
     { \

-        unsigned long hash = 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 ) \
         { \
  \
         while( node ) \
         { \


@@ -465,6 +462,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;
     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 ); }
 public:
     wxIntegerHash() { }
     size_t operator()( long x ) const { return longHash( x ); }


@@ -473,6 +479,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 ); }
     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; }
 };
 
     wxIntegerHash& operator=(const wxIntegerHash&) { return *this; }
 };


@@ -490,6 +500,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; }
     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; }
 };
 
     wxIntegerHash& operator=(const wxIntegerHash&) { return *this; }
 };


@@ -506,6 +520,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; }
     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; }
 };
 
     wxIntegerEqual& operator=(const wxIntegerEqual&) { return *this; }
 };


@@ -622,7 +640,10 @@ public: \
  \
     /* count() == 0 | 1 */ \
     size_type count( const const_key_type& key ) \
  \
     /* count() == 0 | 1 */ \
     size_type count( const const_key_type& key ) \

-        { return GetNode( key ) ? 1 : 0; } \
+    { \
+        /* explicit cast needed to suppress CodeWarrior warnings */ \
+        return (size_type)(GetNode( key ) ? 1 : 0); \
+    } \

 }
 
 #endif // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
 }
 
 #endif // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)