Only define wxIntegerHash::longlongHash when long long isn't long

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h
index ae3667ce41a5f84777cee6397b9ceefbb41681c4..0a20a103ea7ce80d43bb3c1fccadbd6b38b7b5b6 100644 (file)
--- a/include/wx/hashmap.h
+++ b/include/wx/hashmap.h
@@ -460,11 +460,13 @@ class WXDLLIMPEXP_BASE wxIntegerHash
     WX_HASH_MAP_NAMESPACE::hash<short> shortHash;
     WX_HASH_MAP_NAMESPACE::hash<unsigned short> ushortHash;
 
     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)) );
     }
     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() { }
 
 public:
     wxIntegerHash() { }