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

Add wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG symbol.

Browse Source 
Instead of writing a rather unreadable "defined(wxLongLong_t) &&
!defined(wxLongLongIsLong)" expression every time we need to decide if a
function needs to be overloaded for both long and long long, add a new symbol
which can be tested directly.

No real changes in the code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-01-19 10:47:49 +00:00
parent 6686fbad16
commit 066e5e3fd2
5 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/hashmap.h
View File

@@ -490,7 +490,7 @@ class WXDLLIMPEXP_BASE wxIntegerHash
WX_HASH_MAP_NAMESPACE::hash<short> shortHash;
WX_HASH_MAP_NAMESPACE::hash<unsigned short> ushortHash;
#if defined wxLongLong_t && !defined wxLongLongIsLong
#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
// hash<wxLongLong_t> ought to work but doesn't on some compilers
#if (!defined SIZEOF_LONG_LONG && SIZEOF_LONG == 4) \
|| (defined SIZEOF_LONG_LONG && SIZEOF_LONG_LONG == SIZEOF_LONG * 2)
@@ -504,7 +504,7 @@ class WXDLLIMPEXP_BASE wxIntegerHash
#else
WX_HASH_MAP_NAMESPACE::hash<wxLongLong_t> longlongHash;
#endif
#endif
#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
public:
wxIntegerHash() { }
@@ -514,10 +514,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
#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
size_t operator()( wxLongLong_t x ) const { return longlongHash(x); }
size_t operator()( wxULongLong_t x ) const { return longlongHash(x); }
#endif
#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
wxIntegerHash& operator=(const wxIntegerHash&) { return *this; }
};
@@ -535,10 +535,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
#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
wxULongLong_t operator()( wxLongLong_t x ) const { return static_cast<wxULongLong_t>(x); }
wxULongLong_t operator()( wxULongLong_t x ) const { return x; }
#endif
#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
wxIntegerHash& operator=(const wxIntegerHash&) { return *this; }
};
@@ -555,10 +555,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
#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
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
#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
wxIntegerEqual& operator=(const wxIntegerEqual&) { return *this; }
};