X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e38fd1fb0d8c4508383f3d9ce2f3ae0c6d39cfd..ce07cd8a753b3f7ef65ba0138bad86bb34cb4fff:/include/wx/longlong.h diff --git a/include/wx/longlong.h b/include/wx/longlong.h index be9a66619e..9419cf8d0b 100644 --- a/include/wx/longlong.h +++ b/include/wx/longlong.h @@ -7,13 +7,13 @@ // Created: 10.02.99 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_LONGLONG_H #define _WX_LONGLONG_H -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "longlong.h" #endif @@ -38,47 +38,17 @@ // 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 wxLongLongIsLong -#elif (defined(__VISUALC__) && defined(__WIN32__)) || defined( __VMS__ ) - #define wxLongLong_t __int64 -#elif defined(__BORLANDC__) && defined(__WIN32__) && (__BORLANDC__ >= 0x520) - #define wxLongLong_t __int64 -#elif defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8 - #define wxLongLong_t long long -#elif defined(__MINGW32__) || defined(__CYGWIN__) || defined(__WXMICROWIN__) - #define wxLongLong_t long long -#elif defined(__MWERKS__) - #if __option(longlong) - #define wxLongLong_t long long - #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 + // 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 @@ -93,7 +63,8 @@ #define wxUSE_LONGLONG_NATIVE 0 #endif - class WXDLLEXPORT wxLongLongWx; + class WXDLLIMPEXP_BASE wxLongLongWx; + class WXDLLIMPEXP_BASE wxULongLongWx; #if defined(__VISUALC__) && !defined(__WIN32__) #define wxLongLong wxLongLongWx #define wxULongLong wxULongLongWx @@ -111,8 +82,8 @@ #ifndef wxUSE_LONGLONG_WX #define wxUSE_LONGLONG_WX 0 - class WXDLLEXPORT wxLongLongNative; - class WXDLLEXPORT wxULongLongNative; + class WXDLLIMPEXP_BASE wxLongLongNative; + class WXDLLIMPEXP_BASE wxULongLongNative; typedef wxLongLongNative wxLongLong; typedef wxULongLongNative wxULongLong; #endif @@ -125,20 +96,20 @@ // ---------------------------------------------------------------------------- // we use iostream for wxLongLong output -#include "wx/ioswrap.h" +#include "wx/iosfwrap.h" #if wxUSE_LONGLONG_NATIVE -class WXDLLEXPORT wxLongLongNative +class WXDLLIMPEXP_BASE wxLongLongNative { public: // ctors // default ctor initializes to 0 - wxLongLongNative() { m_ll = 0; } + wxLongLongNative() : m_ll(0) { } // from long long - wxLongLongNative(wxLongLong_t ll) { m_ll = ll; } + wxLongLongNative(wxLongLong_t ll) : m_ll(ll) { } // from 2 longs - wxLongLongNative(long hi, unsigned long lo) + wxLongLongNative(long hi, unsigned long lo) : m_ll(0) { // assign first to avoid precision loss! m_ll = ((wxLongLong_t) hi) << 32; @@ -177,11 +148,6 @@ public: // convert to native long long wxLongLong_t GetValue() const { return m_ll; } - // implicit conversion for times when we want a native type - // or wxLongLong, NOT wxLongLongNative and without having - // to ifdef user code for each use. - operator wxLongLong_t() const { return m_ll; } - // convert to long with range checking in the debug mode (only!) long ToLong() const { @@ -212,8 +178,8 @@ public: { m_ll++; return *this; } // post increment - wxLongLongNative& operator++(int) - { m_ll++; return *this; } + wxLongLongNative operator++(int) + { wxLongLongNative value(*this); m_ll++; return value; } // negation operator wxLongLongNative operator-() const @@ -236,8 +202,8 @@ public: { m_ll--; return *this; } // post decrement - wxLongLongNative& operator--(int) - { m_ll--; return *this; } + wxLongLongNative operator--(int) + { wxLongLongNative value(*this); m_ll--; return value; } // shifts // left shift @@ -336,16 +302,16 @@ private: }; -class WXDLLEXPORT wxULongLongNative +class WXDLLIMPEXP_BASE wxULongLongNative { public: // ctors // default ctor initializes to 0 - wxULongLongNative() { m_ll = 0; } + wxULongLongNative() : m_ll(0) { } // from long long - wxULongLongNative(unsigned wxLongLong_t ll) { m_ll = ll; } + wxULongLongNative(unsigned wxLongLong_t ll) : m_ll(ll) { } // from 2 longs - wxULongLongNative(unsigned long hi, unsigned long lo) + wxULongLongNative(unsigned long hi, unsigned long lo) : m_ll(0) { // assign first to avoid precision loss! m_ll = ((unsigned wxLongLong_t) hi) << 32; @@ -377,16 +343,12 @@ public: // convert to ulong with range checking in the debug mode (only!) unsigned long ToULong() const { - wxASSERT_MSG( (m_ll >= LONG_MIN) && (m_ll <= LONG_MAX), + wxASSERT_MSG( m_ll <= LONG_MAX, _T("wxULongLong to long conversion loss of precision") ); return (unsigned long)m_ll; } - // don't provide implicit conversion to unsigned wxLongLong_t or we - // will have an ambiguity for all arithmetic operations - //operator wxULongLong_t() const { return m_ll; } - // operations // addition wxULongLongNative operator+(const wxULongLongNative& ll) const @@ -404,8 +366,8 @@ public: { m_ll++; return *this; } // post increment - wxULongLongNative& operator++(int) - { m_ll++; return *this; } + wxULongLongNative operator++(int) + { wxULongLongNative value(*this); m_ll++; return value; } // subtraction wxULongLongNative operator-(const wxULongLongNative& ll) const @@ -423,8 +385,8 @@ public: { m_ll--; return *this; } // post decrement - wxULongLongNative& operator--(int) - { m_ll--; return *this; } + wxULongLongNative operator--(int) + { wxULongLongNative value(*this); m_ll--; return value; } // shifts // left shift @@ -526,7 +488,7 @@ private: #if wxUSE_LONGLONG_WX -class WXDLLEXPORT wxLongLongWx +class WXDLLIMPEXP_BASE wxLongLongWx { public: // ctors @@ -723,7 +685,7 @@ private: }; -class WXDLLEXPORT wxULongLongWx +class WXDLLIMPEXP_BASE wxULongLongWx { public: // ctors @@ -786,7 +748,7 @@ public: // convert to long with range checking in the debug mode (only!) unsigned long ToULong() const { - wxASSERT_MSG( (m_hi == 0l), + wxASSERT_MSG( m_hi == 0ul, _T("wxULongLong to long conversion loss of precision") ); return (unsigned long)m_lo; @@ -805,7 +767,7 @@ public: // post increment operator wxULongLongWx& operator++(int) { return ++(*this); } - // subraction + // subraction (FIXME: should return wxLongLong) wxULongLongWx operator-(const wxULongLongWx& ll) const; wxULongLongWx& operator-=(const wxULongLongWx& ll); @@ -883,7 +845,7 @@ public: private: // long is at least 32 bits, so represent our 64bit number as 2 longs - unsigned long m_hi + unsigned long m_hi; unsigned long m_lo; #ifdef wxLONGLONG_TEST_MODE @@ -903,23 +865,31 @@ private: // ---------------------------------------------------------------------------- inline bool operator<(long l, const wxLongLong& ll) { return ll > l; } -inline bool operator>(long l, const wxLongLong& ll) { return ll > l; } -inline bool operator<=(long l, const wxLongLong& ll) { return ll > l; } -inline bool operator>=(long l, const wxLongLong& ll) { return ll > l; } -inline bool operator==(long l, const wxLongLong& ll) { return ll > l; } -inline bool operator!=(long l, const wxLongLong& ll) { return ll > l; } +inline bool operator>(long l, const wxLongLong& ll) { return ll < l; } +inline bool operator<=(long l, const wxLongLong& ll) { return ll >= l; } +inline bool operator>=(long l, const wxLongLong& ll) { return ll <= l; } +inline bool operator==(long l, const wxLongLong& ll) { return ll == l; } +inline bool operator!=(long l, const wxLongLong& ll) { return ll != l; } inline wxLongLong operator+(long l, const wxLongLong& ll) { return ll + l; } -inline wxLongLong operator-(long l, const wxLongLong& ll) { return ll - l; } +inline wxLongLong operator-(long l, const wxLongLong& ll) +{ + return wxLongLong(l) - ll; +} + +inline bool operator<(unsigned long l, const wxULongLong& ull) { return ull > l; } +inline bool operator>(unsigned long l, const wxULongLong& ull) { return ull < l; } +inline bool operator<=(unsigned long l, const wxULongLong& ull) { return ull >= l; } +inline bool operator>=(unsigned long l, const wxULongLong& ull) { return ull <= l; } +inline bool operator==(unsigned long l, const wxULongLong& ull) { return ull == l; } +inline bool operator!=(unsigned long l, const wxULongLong& ull) { return ull != l; } -inline bool operator<(unsigned long l, const wxULongLong& ll) { return ll > l; } -inline bool operator>(unsigned long l, const wxULongLong& ll) { return ll > l; } -inline bool operator<=(unsigned long l, const wxULongLong& ll) { return ll > l; } -inline bool operator>=(unsigned long l, const wxULongLong& ll) { return ll > l; } -inline bool operator==(unsigned long l, const wxULongLong& ll) { return ll > l; } -inline bool operator!=(unsigned long l, const wxULongLong& ll) { return ll > l; } +inline wxULongLong operator+(unsigned long l, const wxULongLong& ull) { return ull + l; } -inline wxULongLong operator+(unsigned long l, const wxULongLong& ll) { return ll + l; } -inline wxULongLong operator-(unsigned long l, const wxULongLong& ll) { return ll - l; } +// FIXME: this should return wxLongLong +inline wxULongLong operator-(unsigned long l, const wxULongLong& ull) +{ + return wxULongLong(l) - ull; +} #endif // _WX_LONGLONG_H