X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..0dd9b9e2be1809f484b6447ad9525fa5b404ad95:/include/wx/longlong.h diff --git a/include/wx/longlong.h b/include/wx/longlong.h index e2b2ea79b9..e05287c965 100644 --- a/include/wx/longlong.h +++ b/include/wx/longlong.h @@ -13,11 +13,10 @@ #ifndef _WX_LONGLONG_H #define _WX_LONGLONG_H -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma interface "longlong.h" -#endif - #include "wx/defs.h" + +#if wxUSE_LONGLONG + #include "wx/string.h" #include // for LONG_MAX @@ -38,69 +37,26 @@ // 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 + #ifdef __GNUC__ + #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!" + #elif !(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 +67,8 @@ #define wxUSE_LONGLONG_NATIVE 0 #endif - class WXDLLEXPORT wxLongLongWx; - class WXDLLEXPORT wxULongLongWx; + class WXDLLIMPEXP_FWD_BASE wxLongLongWx; + class WXDLLIMPEXP_FWD_BASE wxULongLongWx; #if defined(__VISUALC__) && !defined(__WIN32__) #define wxLongLong wxLongLongWx #define wxULongLong wxULongLongWx @@ -130,8 +86,8 @@ #ifndef wxUSE_LONGLONG_WX #define wxUSE_LONGLONG_WX 0 - class WXDLLEXPORT wxLongLongNative; - class WXDLLEXPORT wxULongLongNative; + class WXDLLIMPEXP_FWD_BASE wxLongLongNative; + class WXDLLIMPEXP_FWD_BASE wxULongLongNative; typedef wxLongLongNative wxLongLong; typedef wxULongLongNative wxULongLong; #endif @@ -148,7 +104,7 @@ #if wxUSE_LONGLONG_NATIVE -class WXDLLEXPORT wxLongLongNative +class WXDLLIMPEXP_BASE wxLongLongNative { public: // ctors @@ -157,12 +113,15 @@ public: // from long long wxLongLongNative(wxLongLong_t ll) : m_ll(ll) { } // from 2 longs - wxLongLongNative(long hi, unsigned long lo) : m_ll(0) + wxLongLongNative(wxInt32 hi, wxUint32 lo) { - // assign first to avoid precision loss! + // cast to wxLongLong_t first to avoid precision loss! m_ll = ((wxLongLong_t) hi) << 32; m_ll |= (wxLongLong_t) lo; } +#if wxUSE_LONGLONG_WX + wxLongLongNative(wxLongLongWx ll); +#endif // default copy ctor is ok @@ -170,8 +129,26 @@ public: // assignment operators // from native 64 bit integer +#ifndef wxLongLongIsLong wxLongLongNative& operator=(wxLongLong_t ll) { m_ll = ll; return *this; } + wxLongLongNative& operator=(wxULongLong_t ll) + { m_ll = ll; return *this; } +#endif // !wxLongLongNative + wxLongLongNative& operator=(const wxULongLongNative &ll); + wxLongLongNative& operator=(int l) + { m_ll = l; return *this; } + wxLongLongNative& operator=(long l) + { m_ll = l; return *this; } + wxLongLongNative& operator=(unsigned int l) + { m_ll = l; return *this; } + wxLongLongNative& operator=(unsigned long l) + { m_ll = l; return *this; } +#if wxUSE_LONGLONG_WX + wxLongLongNative& operator=(wxLongLongWx ll); + wxLongLongNative& operator=(const class wxULongLongWx &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 @@ -183,11 +160,11 @@ public: // accessors // get high part - long GetHi() const - { return (long)(m_ll >> 32); } + wxInt32 GetHi() const + { return wx_truncate_cast(wxInt32, m_ll >> 32); } // get low part - unsigned long GetLo() const - { return (unsigned long)m_ll; } + wxUint32 GetLo() const + { return wx_truncate_cast(wxUint32, m_ll); } // get absolute value wxLongLongNative Abs() const { return wxLongLongNative(*this).Abs(); } @@ -196,15 +173,18 @@ public: // convert to native long long wxLongLong_t GetValue() const { return m_ll; } - // convert to long with range checking in the debug mode (only!) + // convert to long with range checking in debug mode (only!) long ToLong() const { wxASSERT_MSG( (m_ll >= LONG_MIN) && (m_ll <= LONG_MAX), _T("wxLongLong to long conversion loss of precision") ); - return (long)m_ll; + return wx_truncate_cast(long, m_ll); } + // convert to double + double ToDouble() const { return wx_truncate_cast(double, m_ll); } + // don't provide implicit conversion to wxLongLong_t or we will have an // ambiguity for all arithmetic operations //operator wxLongLong_t() const { return m_ll; } @@ -256,13 +236,13 @@ public: // shifts // left shift wxLongLongNative operator<<(int shift) const - { return wxLongLongNative(m_ll << shift);; } + { return wxLongLongNative(m_ll << shift); } wxLongLongNative& operator<<=(int shift) { m_ll <<= shift; return *this; } // right shift wxLongLongNative operator>>(int shift) const - { return wxLongLongNative(m_ll >> shift);; } + { return wxLongLongNative(m_ll >> shift); } wxLongLongNative& operator>>=(int shift) { m_ll >>= shift; return *this; } @@ -342,7 +322,18 @@ public: #if wxUSE_STD_IOSTREAM // input/output - friend wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongNative&); + friend WXDLLIMPEXP_BASE + wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongNative&); +#endif + + friend WXDLLIMPEXP_BASE + wxString& operator<<(wxString&, const wxLongLongNative&); + +#if wxUSE_STREAMS + friend WXDLLIMPEXP_BASE + class wxTextOutputStream& operator<<(class wxTextOutputStream&, const wxLongLongNative&); + friend WXDLLIMPEXP_BASE + class wxTextInputStream& operator>>(class wxTextInputStream&, wxLongLongNative&); #endif private: @@ -350,53 +341,82 @@ private: }; -class WXDLLEXPORT wxULongLongNative +class WXDLLIMPEXP_BASE wxULongLongNative { public: // ctors // default ctor initializes to 0 wxULongLongNative() : m_ll(0) { } // from long long - wxULongLongNative(unsigned wxLongLong_t ll) : m_ll(ll) { } + wxULongLongNative(wxULongLong_t ll) : m_ll(ll) { } // from 2 longs - wxULongLongNative(unsigned long hi, unsigned long lo) : m_ll(0) + wxULongLongNative(wxUint32 hi, wxUint32 lo) : m_ll(0) { - // assign first to avoid precision loss! - m_ll = ((unsigned wxLongLong_t) hi) << 32; - m_ll |= (unsigned wxLongLong_t) lo; + // cast to wxLongLong_t first to avoid precision loss! + m_ll = ((wxULongLong_t) hi) << 32; + m_ll |= (wxULongLong_t) lo; } +#if wxUSE_LONGLONG_WX + wxULongLongNative(const class wxULongLongWx &ll); +#endif + // default copy ctor is ok // no dtor // assignment operators // from native 64 bit integer - wxULongLongNative& operator=(unsigned wxLongLong_t ll) +#ifndef wxLongLongIsLong + wxULongLongNative& operator=(wxULongLong_t ll) + { m_ll = ll; return *this; } + wxULongLongNative& operator=(wxLongLong_t ll) { m_ll = ll; return *this; } +#endif // !wxLongLongNative + wxULongLongNative& operator=(int l) + { m_ll = l; return *this; } + wxULongLongNative& operator=(long l) + { m_ll = l; return *this; } + wxULongLongNative& operator=(unsigned int l) + { m_ll = l; return *this; } + wxULongLongNative& operator=(unsigned long l) + { m_ll = l; return *this; } + wxULongLongNative& operator=(const wxLongLongNative &ll) + { m_ll = ll.GetValue(); return *this; } +#if wxUSE_LONGLONG_WX + wxULongLongNative& operator=(wxLongLongWx ll); + wxULongLongNative& operator=(const class wxULongLongWx &ll); +#endif // assignment operators from wxULongLongNative is ok // accessors // get high part - unsigned long GetHi() const - { return (unsigned long)(m_ll >> 32); } + wxUint32 GetHi() const + { return wx_truncate_cast(wxUint32, m_ll >> 32); } // get low part - unsigned long GetLo() const - { return (unsigned long)m_ll; } + wxUint32 GetLo() const + { return wx_truncate_cast(wxUint32, m_ll); } // convert to native ulong long - unsigned wxLongLong_t GetValue() const { return m_ll; } + wxULongLong_t GetValue() const { return m_ll; } - // convert to ulong with range checking in the debug mode (only!) + // convert to ulong with range checking in debug mode (only!) unsigned long ToULong() const { wxASSERT_MSG( m_ll <= LONG_MAX, _T("wxULongLong to long conversion loss of precision") ); - return (unsigned long)m_ll; + return wx_truncate_cast(unsigned long, m_ll); } + // convert to double +#ifdef _MSC_VER + double ToDouble() const { return wx_truncate_cast(double, (__int64) m_ll); } +#else + double ToDouble() const { return wx_truncate_cast(double, m_ll); } +#endif + // operations // addition wxULongLongNative operator+(const wxULongLongNative& ll) const @@ -404,9 +424,9 @@ public: wxULongLongNative& operator+=(const wxULongLongNative& ll) { m_ll += ll.m_ll; return *this; } - wxULongLongNative operator+(const unsigned wxLongLong_t ll) const + wxULongLongNative operator+(const wxULongLong_t ll) const { return wxULongLongNative(m_ll + ll); } - wxULongLongNative& operator+=(const unsigned wxLongLong_t ll) + wxULongLongNative& operator+=(const wxULongLong_t ll) { m_ll += ll; return *this; } // pre increment @@ -423,9 +443,9 @@ public: wxULongLongNative& operator-=(const wxULongLongNative& ll) { m_ll -= ll.m_ll; return *this; } - wxULongLongNative operator-(const unsigned wxLongLong_t ll) const + wxULongLongNative operator-(const wxULongLong_t ll) const { return wxULongLongNative(m_ll - ll); } - wxULongLongNative& operator-=(const unsigned wxLongLong_t ll) + wxULongLongNative& operator-=(const wxULongLong_t ll) { m_ll -= ll; return *this; } // pre decrement @@ -439,13 +459,13 @@ public: // shifts // left shift wxULongLongNative operator<<(int shift) const - { return wxULongLongNative(m_ll << shift);; } + { return wxULongLongNative(m_ll << shift); } wxULongLongNative& operator<<=(int shift) { m_ll <<= shift; return *this; } // right shift wxULongLongNative operator>>(int shift) const - { return wxULongLongNative(m_ll >> shift);; } + { return wxULongLongNative(m_ll >> shift); } wxULongLongNative& operator>>=(int shift) { m_ll >>= shift; return *this; } @@ -525,18 +545,36 @@ public: #if wxUSE_STD_IOSTREAM // input/output - friend wxSTD ostream& operator<<(wxSTD ostream&, const wxULongLongNative&); + friend WXDLLIMPEXP_BASE + wxSTD ostream& operator<<(wxSTD ostream&, const wxULongLongNative&); +#endif + + friend WXDLLIMPEXP_BASE + wxString& operator<<(wxString&, const wxULongLongNative&); + +#if wxUSE_STREAMS + friend WXDLLIMPEXP_BASE + class wxTextOutputStream& operator<<(class wxTextOutputStream&, const wxULongLongNative&); + friend WXDLLIMPEXP_BASE + class wxTextInputStream& operator>>(class wxTextInputStream&, wxULongLongNative&); #endif private: - unsigned wxLongLong_t m_ll; + wxULongLong_t m_ll; }; +inline +wxLongLongNative& wxLongLongNative::operator=(const wxULongLongNative &ll) +{ + m_ll = ll.GetValue(); + return *this; +} + #endif // wxUSE_LONGLONG_NATIVE #if wxUSE_LONGLONG_WX -class WXDLLEXPORT wxLongLongWx +class WXDLLIMPEXP_BASE wxLongLongWx { public: // ctors @@ -587,7 +625,34 @@ public: return *this; } - // from double + // from int + wxLongLongWx& operator=(int l) + { + return operator=((long)l); + } + + wxLongLongWx& operator=(unsigned long l) + { + m_lo = l; + m_hi = 0; + +#ifdef wxLONGLONG_TEST_MODE + m_ll = l; + + Check(); +#endif // wxLONGLONG_TEST_MODE + + return *this; + } + + wxLongLongWx& operator=(unsigned int l) + { + return operator=((unsigned long)l); + } + + wxLongLongWx& operator=(const class wxULongLongWx &ll); + + // from double wxLongLongWx& Assign(double d); // can't have assignment operator from 2 longs @@ -614,7 +679,7 @@ public: return *this; } - // convert to long with range checking in the debug mode (only!) + // convert to long with range checking in debug mode (only!) long ToLong() const { wxASSERT_MSG( (m_hi == 0l) || (m_hi == -1l), @@ -623,6 +688,9 @@ public: return (long)m_lo; } + // convert to double + double ToDouble() const; + // operations // addition wxLongLongWx operator+(const wxLongLongWx& ll) const; @@ -671,6 +739,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; @@ -713,9 +785,20 @@ public: void *asArray() const; #if wxUSE_STD_IOSTREAM - friend wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongWx&); + friend WXDLLIMPEXP_BASE + wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongWx&); #endif // wxUSE_STD_IOSTREAM + friend WXDLLIMPEXP_BASE + wxString& operator<<(wxString&, const wxLongLongWx&); + +#if wxUSE_STREAMS + friend WXDLLIMPEXP_BASE + class wxTextOutputStream& operator<<(class wxTextOutputStream&, const wxLongLongWx&); + friend WXDLLIMPEXP_BASE + class wxTextInputStream& operator>>(class wxTextInputStream&, wxLongLongWx&); +#endif + private: // long is at least 32 bits, so represent our 64bit number as 2 longs @@ -733,7 +816,7 @@ private: }; -class WXDLLEXPORT wxULongLongWx +class WXDLLIMPEXP_BASE wxULongLongWx { public: // ctors @@ -765,6 +848,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 @@ -784,6 +875,26 @@ public: return *this; } + wxULongLongWx& operator=(long l) + { + m_lo = l; + m_hi = (unsigned long) ((l<0) ? -1l : 0); + +#ifdef wxLONGLONG_TEST_MODE + m_ll = (wxULongLong_t) (wxLongLong_t) l; + + Check(); +#endif // wxLONGLONG_TEST_MODE + + return *this; + } + wxULongLongWx& operator=(const class wxLongLongWx &ll) { + // Should we use an assert like it was before in the constructor? + // wxASSERT(ll.GetHi() >= 0); + m_hi = (unsigned long)ll.GetHi(); + m_lo = ll.GetLo(); + return *this; + } // can't have assignment operator from 2 longs @@ -793,7 +904,7 @@ public: // get low part unsigned long GetLo() const { return m_lo; } - // convert to long with range checking in the debug mode (only!) + // convert to long with range checking in debug mode (only!) unsigned long ToULong() const { wxASSERT_MSG( m_hi == 0ul, @@ -802,6 +913,9 @@ public: return (unsigned long)m_lo; } + // convert to double + double ToDouble() const; + // operations // addition wxULongLongWx operator+(const wxULongLongWx& ll) const; @@ -815,8 +929,8 @@ public: // post increment operator wxULongLongWx& operator++(int) { return ++(*this); } - // subraction (FIXME: should return wxLongLong) - wxULongLongWx operator-(const wxULongLongWx& ll) const; + // subtraction + wxLongLongWx operator-(const wxULongLongWx& ll) const; wxULongLongWx& operator-=(const wxULongLongWx& ll); // pre decrement operator @@ -887,9 +1001,20 @@ public: void *asArray() const; #if wxUSE_STD_IOSTREAM - friend wxSTD ostream& operator<<(wxSTD ostream&, const wxULongLongWx&); + friend WXDLLIMPEXP_BASE + wxSTD ostream& operator<<(wxSTD ostream&, const wxULongLongWx&); #endif // wxUSE_STD_IOSTREAM + friend WXDLLIMPEXP_BASE + wxString& operator<<(wxString&, const wxULongLongWx&); + +#if wxUSE_STREAMS + friend WXDLLIMPEXP_BASE + class wxTextOutputStream& operator<<(class wxTextOutputStream&, const wxULongLongWx&); + friend WXDLLIMPEXP_BASE + class wxTextInputStream& operator>>(class wxTextInputStream&, wxULongLongWx&); +#endif + private: // long is at least 32 bits, so represent our 64bit number as 2 longs @@ -902,7 +1027,7 @@ private: wxASSERT( (m_ll >> 32) == m_hi && (unsigned long)m_ll == m_lo ); } - unsigned wxLongLong_t m_ll; + wxULongLong_t m_ll; #endif // wxLONGLONG_TEST_MODE }; @@ -934,10 +1059,22 @@ 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()); } +#if wxUSE_LONGLONG_NATIVE && wxUSE_STREAMS + +WXDLLIMPEXP_BASE class wxTextOutputStream &operator<<(class wxTextOutputStream &stream, wxULongLong_t value); +WXDLLIMPEXP_BASE class wxTextOutputStream &operator<<(class wxTextOutputStream &stream, wxLongLong_t value); + +WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &stream, wxULongLong_t &value); +WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &stream, wxLongLong_t &value); + +#endif + +#endif // wxUSE_LONGLONG + #endif // _WX_LONGLONG_H