Add wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG symbol.

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

diff --git a/docs/doxygen/mainpages/const_cpp.h b/docs/doxygen/mainpages/const_cpp.h
index 1344f7c50ad2e0f96a2097dcaab65bd9c1e1d9f0..b422555de82294404f69c6d1d04613a430c30d86 100644 (file)
--- a/docs/doxygen/mainpages/const_cpp.h
+++ b/docs/doxygen/mainpages/const_cpp.h
@@ -209,6 +209,13 @@ Currently the following symbols exist:
 @itemdef{wxHAS_LARGE_FFILES, Defined if wxFFile supports files more than 4GB in
     size (notice that you must include @c wx/filefn.h before testing for this
     symbol).}
+@itemdef{wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG, Defined if compiler supports a
+    64 bit integer type (available as @c wxLongLong_t) and this type is
+    different from long. Notice that, provided wxUSE_LONGLONG is not turned
+    off, some 64 bit type is always available to wxWidgets programs and this
+    symbol only indicates a presence of such primitive type. It is useful to
+    decide whether some function should be overloaded for both
+    <code>long</code> and <code>long long</code> types.}
 @itemdef{wxHAS_MULTIPLE_FILEDLG_FILTERS, Defined if wxFileDialog supports multiple ('|'-separated) filters.}
 @itemdef{wxHAS_POWER_EVENTS, Defined if wxPowerEvent are ever generated on the current platform.}
 @itemdef{wxHAS_RADIO_MENU_ITEMS,

diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h
index d320acdc7109dc922fcbefac74d03ca0a09a3493..9c646ff0838d138b934cf9cf187a496d43bdeb9e 100644 (file)
--- a/include/wx/cppunit.h
+++ b/include/wx/cppunit.h
@@ -200,10 +200,10 @@ WX_CPPUNIT_ALLOW_EQUALS_TO_INT(short)
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned)
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned long)
 
-#if defined(wxLongLong_t) && !defined(wxLongLongIsLong)
+#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxLongLong_t)
 WX_CPPUNIT_ALLOW_EQUALS_TO_INT(unsigned wxLongLong_t)
-#endif
+#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
 
 // Use this macro to compare a wxArrayString with the pipe-separated elements
 // of the given string

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 46c07376d7a6b0aba41496ae316179b2371ffe8d..6130fae99bfc99fc6a883c10d77972590a894008 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1075,6 +1075,9 @@ typedef wxUint32 wxDword;
 
     #define wxHAS_INT64 1
 
+    #ifndef wxLongLongIsLong
+        #define wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
+    #endif
 #elif wxUSE_LONGLONG
     /*  these macros allow to define 64 bit constants in a portable way */
     #define wxLL(x) wxLongLong(x)

diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h
index 252df7885d8950209233befad704369f137d99ec..c6f9f46941596508e211bbe7fd7814ec65af374d 100644 (file)
--- a/include/wx/hashmap.h
+++ b/include/wx/hashmap.h
@@ -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; }
 };

diff --git a/include/wx/string.h b/include/wx/string.h
index 95d440a362a8cee9299a4a5c4b3b5412ad1eb585..f51d3f066023a02d3a89c4672f47d5d03e520559 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -2121,7 +2121,7 @@ public:
       // insert an unsigned long into string
   wxString& operator<<(unsigned long ul)
     { return (*this) << Format(wxT("%lu"), ul); }
-#if defined wxLongLong_t && !defined wxLongLongIsLong
+#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
       // insert a long long if they exist and aren't longs
   wxString& operator<<(wxLongLong_t ll)
     {
@@ -2132,7 +2132,7 @@ public:
     {
       return (*this) << Format("%" wxLongLongFmtSpec "u" , ull);
     }
-#endif // wxLongLong_t && !wxLongLongIsLong
+#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
       // insert a float into string
   wxString& operator<<(float f)
     { return (*this) << Format(wxT("%f"), f); }