X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/886dd7d28e50c003cc88b81b968d487a3c17b0d7..549c8cc2fe3ab03276745d546b0f81297c34a147:/include/wx/longlong.h diff --git a/include/wx/longlong.h b/include/wx/longlong.h index d59532ca9e..1a006e757c 100644 --- a/include/wx/longlong.h +++ b/include/wx/longlong.h @@ -13,7 +13,7 @@ #ifndef _WX_LONGLONG_H #define _WX_LONGLONG_H -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "longlong.h" #endif @@ -38,69 +38,21 @@ // decide upon which class we will use // ---------------------------------------------------------------------------- -// to avoid compilation problems on 64bit machines with ambiguous method calls -// we will need to define this -#undef wxLongLongIsLong - -// NB: we #define and not typedef wxLongLong_t because we want to be able to -// use 'unsigned wxLongLong_t' as well and because we use "#ifdef -// wxLongLong_t" below - -// first check for generic cases which are long on 64bit machine and "long -// long", then check for specific compilers -#if defined(SIZEOF_LONG) && (SIZEOF_LONG == 8) - #define wxLongLong_t long - #define wxLongLongSuffix l - #define wxLongLongFmtSpec _T("l") - #define wxLongLongIsLong -#elif (defined(__VISUALC__) && defined(__WIN32__)) || defined( __VMS__ ) - #define wxLongLong_t __int64 - #define wxLongLongSuffix i64 - #define wxLongLongFmtSpec _T("I64") -#elif defined(__BORLANDC__) && defined(__WIN32__) && (__BORLANDC__ >= 0x520) - #define wxLongLong_t __int64 - #define wxLongLongSuffix i64 - #define wxLongLongFmtSpec _T("Ld") -#elif (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8) || \ - defined(__MINGW32__) || \ - defined(__GNUC__) || \ - defined(__CYGWIN__) || \ - defined(__WXMICROWIN__) || \ - (defined(__DJGPP__) && __DJGPP__ >= 2) - #define wxLongLong_t long long - #define wxLongLongSuffix ll - #define wxLongLongFmtSpec _T("ll") -#elif defined(__MWERKS__) - #if __option(longlong) - #define wxLongLong_t long long - #define wxLongLongSuffix ll - #define wxLongLongFmtSpec _T("ll") - #else - #error "The 64 bit integer support in CodeWarrior has been disabled." - #error "See the documentation on the 'longlong' pragma." - #endif -#elif defined(__VISAGECPP__) && __IBMCPP__ >= 400 - #define wxLongLong_t long long -#else // no native long long type +#ifndef wxLongLong_t // both warning and pragma warning are not portable, but at least an // unknown pragma should never be an error -- except that, actually, some // broken compilers don't like it, so we have to disable it in this case // -#if !(defined(__WATCOMC__) || defined(__VISAGECPP__)) - #pragma warning "Your compiler does not appear to support 64 bit "\ - "integers, using emulation class instead.\n" \ - "Please report your compiler version to " \ - "wx-dev@lists.wxwindows.org!" -#endif + #if !(defined(__WATCOMC__) || defined(__VISAGECPP__)) + #pragma warning "Your compiler does not appear to support 64 bit "\ + "integers, using emulation class instead.\n" \ + "Please report your compiler version to " \ + "wx-dev@lists.wxwidgets.org!" + #endif #define wxUSE_LONGLONG_WX 1 #endif // compiler -// this macro allows to definea 64 bit constant in a portable way -#define wxMakeLongLong(x, s) x ## s -#define wxMakeLongLong2(x, s) wxMakeLongLong(x, s) -#define wxLL(x) wxMakeLongLong2(x, wxLongLongSuffix) - // the user may predefine wxUSE_LONGLONG_NATIVE and/or wxUSE_LONGLONG_NATIVE // to disable automatic testing (useful for the test program which defines // both classes) but by default we only use one class @@ -111,8 +63,8 @@ #define wxUSE_LONGLONG_NATIVE 0 #endif - class WXDLLEXPORT_BASE wxLongLongWx; - class WXDLLEXPORT_BASE wxULongLongWx; + class WXDLLIMPEXP_BASE wxLongLongWx; + class WXDLLIMPEXP_BASE wxULongLongWx; #if defined(__VISUALC__) && !defined(__WIN32__) #define wxLongLong wxLongLongWx #define wxULongLong wxULongLongWx @@ -130,8 +82,8 @@ #ifndef wxUSE_LONGLONG_WX #define wxUSE_LONGLONG_WX 0 - class WXDLLEXPORT_BASE wxLongLongNative; - class WXDLLEXPORT_BASE wxULongLongNative; + class WXDLLIMPEXP_BASE wxLongLongNative; + class WXDLLIMPEXP_BASE wxULongLongNative; typedef wxLongLongNative wxLongLong; typedef wxULongLongNative wxULongLong; #endif @@ -148,7 +100,7 @@ #if wxUSE_LONGLONG_NATIVE -class WXDLLEXPORT_BASE wxLongLongNative +class WXDLLIMPEXP_BASE wxLongLongNative { public: // ctors @@ -163,6 +115,9 @@ public: m_ll = ((wxLongLong_t) hi) << 32; m_ll |= (wxLongLong_t) lo; } +#if wxUSE_LONGLONG_WX + wxLongLongNative(wxLongLongWx ll); +#endif // default copy ctor is ok @@ -172,6 +127,10 @@ public: // from native 64 bit integer wxLongLongNative& operator=(wxLongLong_t ll) { m_ll = ll; return *this; } +#if wxUSE_LONGLONG_WX + wxLongLongNative& operator=(wxLongLongWx ll); +#endif + // from double: this one has an explicit name because otherwise we // would have ambiguity with "ll = int" and also because we don't want @@ -345,12 +304,14 @@ public: friend wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongNative&); #endif + friend wxString& operator<<(wxString&, const wxLongLongNative&); + private: wxLongLong_t m_ll; }; -class WXDLLEXPORT_BASE wxULongLongNative +class WXDLLIMPEXP_BASE wxULongLongNative { public: // ctors @@ -528,6 +489,8 @@ public: friend wxSTD ostream& operator<<(wxSTD ostream&, const wxULongLongNative&); #endif + friend wxString& operator<<(wxString&, const wxULongLongNative&); + private: unsigned wxLongLong_t m_ll; }; @@ -536,7 +499,7 @@ private: #if wxUSE_LONGLONG_WX -class WXDLLEXPORT_BASE wxLongLongWx +class WXDLLIMPEXP_BASE wxLongLongWx { public: // ctors @@ -671,6 +634,10 @@ public: // comparison bool operator==(const wxLongLongWx& ll) const { return m_lo == ll.m_lo && m_hi == ll.m_hi; } +#if wxUSE_LONGLONG_NATIVE + bool operator==(const wxLongLongNative& ll) const + { return m_lo == ll.GetLo() && m_hi == ll.GetHi(); } +#endif bool operator!=(const wxLongLongWx& ll) const { return !(*this == ll); } bool operator<(const wxLongLongWx& ll) const; @@ -716,6 +683,8 @@ public: friend wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongWx&); #endif // wxUSE_STD_IOSTREAM + friend wxString& operator<<(wxString&, const wxLongLongWx&); + private: // long is at least 32 bits, so represent our 64bit number as 2 longs @@ -733,7 +702,7 @@ private: }; -class WXDLLEXPORT_BASE wxULongLongWx +class WXDLLIMPEXP_BASE wxULongLongWx { public: // ctors @@ -765,6 +734,14 @@ public: #endif // wxLONGLONG_TEST_MODE } + // from signed to unsigned + wxULongLongWx(wxLongLongWx ll) + { + wxASSERT(ll.GetHi() >= 0); + m_hi = (unsigned long)ll.GetHi(); + m_lo = ll.GetLo(); + } + // default copy ctor is ok in both cases // no dtor @@ -815,8 +792,8 @@ public: // post increment operator wxULongLongWx& operator++(int) { return ++(*this); } - // subraction (FIXME: should return wxLongLong) - wxULongLongWx operator-(const wxULongLongWx& ll) const; + // substraction + wxLongLongWx operator-(const wxULongLongWx& ll) const; wxULongLongWx& operator-=(const wxULongLongWx& ll); // pre decrement operator @@ -890,6 +867,8 @@ public: friend wxSTD ostream& operator<<(wxSTD ostream&, const wxULongLongWx&); #endif // wxUSE_STD_IOSTREAM + friend wxString& operator<<(wxString&, const wxULongLongWx&); + private: // long is at least 32 bits, so represent our 64bit number as 2 longs @@ -934,10 +913,10 @@ inline bool operator!=(unsigned long l, const wxULongLong& ull) { return ull != inline wxULongLong operator+(unsigned long l, const wxULongLong& ull) { return ull + l; } -// FIXME: this should return wxLongLong -inline wxULongLong operator-(unsigned long l, const wxULongLong& ull) +inline wxLongLong operator-(unsigned long l, const wxULongLong& ull) { - return wxULongLong(l) - ull; + wxULongLong ret = wxULongLong(l) - ull; + return wxLongLong((long)ret.GetHi(),ret.GetLo()); } #endif // _WX_LONGLONG_H