X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e116788a252ca2f8de2f42b598795f3525779e0..af2372b95d4aca14e97c1ffaca6954f136513589:/include/wx/hashmap.h diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h index 9a25f8e183..ed26c35418 100644 --- a/include/wx/hashmap.h +++ b/include/wx/hashmap.h @@ -4,7 +4,6 @@ // Author: Mattia Barbon // Modified by: // Created: 29/01/2002 -// RCS-ID: $Id$ // Copyright: (c) Mattia Barbon // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -483,8 +482,9 @@ inline bool grow_lf70( size_t buckets, size_t items ) #ifndef wxNEEDS_WX_HASH_MAP // integer types -class WXDLLIMPEXP_BASE wxIntegerHash +struct WXDLLIMPEXP_BASE wxIntegerHash { +private: WX_HASH_MAP_NAMESPACE::hash longHash; WX_HASH_MAP_NAMESPACE::hash ulongHash; WX_HASH_MAP_NAMESPACE::hash intHash; @@ -527,9 +527,8 @@ public: #else // wxNEEDS_WX_HASH_MAP // integer types -class WXDLLIMPEXP_BASE wxIntegerHash +struct WXDLLIMPEXP_BASE wxIntegerHash { -public: wxIntegerHash() { } unsigned long operator()( long x ) const { return (unsigned long)x; } unsigned long operator()( unsigned long x ) const { return x; } @@ -547,9 +546,8 @@ public: #endif // !wxNEEDS_WX_HASH_MAP/wxNEEDS_WX_HASH_MAP -class WXDLLIMPEXP_BASE wxIntegerEqual +struct WXDLLIMPEXP_BASE wxIntegerEqual { -public: wxIntegerEqual() { } bool operator()( long a, long b ) const { return a == b; } bool operator()( unsigned long a, unsigned long b ) const { return a == b; } @@ -566,9 +564,8 @@ public: }; // pointers -class WXDLLIMPEXP_BASE wxPointerHash +struct WXDLLIMPEXP_BASE wxPointerHash { -public: wxPointerHash() { } #ifdef wxNEEDS_WX_HASH_MAP @@ -580,9 +577,8 @@ public: wxPointerHash& operator=(const wxPointerHash&) { return *this; } }; -class WXDLLIMPEXP_BASE wxPointerEqual +struct WXDLLIMPEXP_BASE wxPointerEqual { -public: wxPointerEqual() { } bool operator()( const void* a, const void* b ) const { return a == b; } @@ -590,9 +586,8 @@ public: }; // wxString, char*, wchar_t* -class WXDLLIMPEXP_BASE wxStringHash +struct WXDLLIMPEXP_BASE wxStringHash { -public: wxStringHash() {} unsigned long operator()( const wxString& x ) const { return stringHash( x.wx_str() ); } @@ -616,9 +611,8 @@ public: wxStringHash& operator=(const wxStringHash&) { return *this; } }; -class WXDLLIMPEXP_BASE wxStringEqual +struct WXDLLIMPEXP_BASE wxStringEqual { -public: wxStringEqual() {} bool operator()( const wxString& a, const wxString& b ) const { return a == b; }