X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/df5168c427b51f1ab2b3200a5c8f7626b3d24aae..02ac8d7a5ddbd0694b46cc5133e82eb22d935829:/include/wx/hashmap.h diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h index 554030a564..91c867ce86 100644 --- a/include/wx/hashmap.h +++ b/include/wx/hashmap.h @@ -20,6 +20,10 @@ #include // for ptrdiff_t +#ifdef __WXWINCE__ +typedef int ptrdiff_t; +#endif + // private struct WXDLLIMPEXP_BASE _wxHashTable_NodeBase { @@ -370,7 +374,6 @@ public: \ typedef const VALUE_T const_t2; \ \ CLASSNAME( const const_t1& f, const const_t2& s ):first(t1(f)),second(t2(s)) {} \ - CLASSNAME( const const_t1& f ):first(t1(f)),second(t2()) {} \ \ t1 first; \ t2 second; \ @@ -513,7 +516,7 @@ public: \ \ mapped_type& operator[]( const const_key_type& key ) \ { \ - return GetOrCreateNode( CLASSNAME##_wxImplementation_Pair( key ) )->m_value.second; \ + return GetOrCreateNode( CLASSNAME##_wxImplementation_Pair( key, mapped_type() ) )->m_value.second; \ } \ \ const_iterator find( const const_key_type& key ) const \ @@ -571,7 +574,7 @@ public: \ // count on it)! #define WX_CLEAR_HASH_MAP(type, hashmap) \ { \ - type##::iterator it, en; \ + type::iterator it, en; \ for( it = (hashmap).begin(), en = (hashmap).end(); it != en; ++it ) \ delete it->second; \ (hashmap).clear(); \