// Purpose: declaration of wxLongLong class - best implementation of a 64
// bit integer for the current platform.
// Author: Jeffrey C. Ollie <jeff@ollie.clive.ia.us>, Vadim Zeitlin
-// Remarks: this class is not public in wxWindows 2.0! It is intentionally
-// not documented and is for private use only.
// Modified by:
// Created: 10.02.99
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// 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
#include "wx/defs.h"
-#include "wx/wxchar.h"
-#include "wx/debug.h"
+#include "wx/string.h"
#include <limits.h> // for LONG_MAX
-// #define wxUSE_LONGLONG_WX 1 // for testing (VZ)
+// define this to compile wxLongLongWx in "test" mode: the results of all
+// calculations will be compared with the real results taken from
+// wxLongLongNative -- this is extremely useful to find the bugs in
+// wxLongLongWx class!
+
+// #define wxLONGLONG_TEST_MODE
+
+#ifdef wxLONGLONG_TEST_MODE
+ #define wxUSE_LONGLONG_WX 1
+ #define wxUSE_LONGLONG_NATIVE 1
+#endif // wxLONGLONG_TEST_MODE
// ----------------------------------------------------------------------------
// 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
-#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__) && (__BORLANDC__ >= 0x530)
- #define wxLongLong_t __int64
-#elif defined(__GNUG__)
- #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
-#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.
- // Err, actually, Watcom C++ doesn't like it.
- // (well, if the compilers are _that_ broken, I'm removing it (VZ))
-#if 0 //ndef __WATCOMC__
- #pragma warning "Your compiler does not appear to support 64 bit "\
- "integers, using emulation class instead."
-#endif
+ // 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
+ // <sigh>
+ #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
#define wxUSE_LONGLONG_WX 1
#endif // compiler
// to disable automatic testing (useful for the test program which defines
// both classes) but by default we only use one class
#if (defined(wxUSE_LONGLONG_WX) && wxUSE_LONGLONG_WX) || !defined(wxLongLong_t)
- #undef wxUSE_LONGLONG_NATIVE
- #define wxUSE_LONGLONG_NATIVE 0
- class WXDLLEXPORT wxLongLongWx;
+ // don't use both classes unless wxUSE_LONGLONG_NATIVE was explicitly set:
+ // this is useful in test programs and only there
+ #ifndef wxUSE_LONGLONG_NATIVE
+ #define wxUSE_LONGLONG_NATIVE 0
+ #endif
+
+ class WXDLLIMPEXP_BASE wxLongLongWx;
+ class WXDLLIMPEXP_BASE wxULongLongWx;
+#if defined(__VISUALC__) && !defined(__WIN32__)
+ #define wxLongLong wxLongLongWx
+ #define wxULongLong wxULongLongWx
+#else
typedef wxLongLongWx wxLongLong;
+ typedef wxULongLongWx wxULongLong;
+#endif
+
#else
// if nothing is defined, use native implementation by default, of course
#ifndef wxUSE_LONGLONG_NATIVE
#ifndef wxUSE_LONGLONG_WX
#define wxUSE_LONGLONG_WX 0
- class WXDLLEXPORT wxLongLongNative;
+ class WXDLLIMPEXP_BASE wxLongLongNative;
+ class WXDLLIMPEXP_BASE wxULongLongNative;
typedef wxLongLongNative wxLongLong;
+ typedef wxULongLongNative wxULongLong;
#endif
// NB: if both wxUSE_LONGLONG_WX and NATIVE are defined, the user code should
// ----------------------------------------------------------------------------
// 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;
{ 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
{ return wxLongLongNative(-m_ll); }
+ wxLongLongNative& Negate() { m_ll = -m_ll; return *this; }
// subtraction
wxLongLongNative operator-(const wxLongLongNative& ll) const
{ 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
{ return m_ll >= l; }
// miscellaneous
+
+ // return the string representation of this number
+ wxString ToString() const;
+
// conversion to byte array: returns a pointer to static buffer!
void *asArray() const;
#if wxUSE_STD_IOSTREAM
// input/output
- friend ostream& operator<<(ostream&, const wxLongLongNative&);
+ friend wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongNative&);
#endif
private:
wxLongLong_t m_ll;
};
+
+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) { }
+ // from 2 longs
+ wxULongLongNative(unsigned long hi, unsigned long lo) : m_ll(0)
+ {
+ // assign first to avoid precision loss!
+ m_ll = ((unsigned wxLongLong_t) hi) << 32;
+ m_ll |= (unsigned wxLongLong_t) lo;
+ }
+
+ // default copy ctor is ok
+
+ // no dtor
+
+ // assignment operators
+ // from native 64 bit integer
+ wxULongLongNative& operator=(unsigned wxLongLong_t ll)
+ { m_ll = ll; return *this; }
+
+ // assignment operators from wxULongLongNative is ok
+
+ // accessors
+ // get high part
+ unsigned long GetHi() const
+ { return (unsigned long)(m_ll >> 32); }
+ // get low part
+ unsigned long GetLo() const
+ { return (unsigned long)m_ll; }
+
+ // convert to native ulong long
+ unsigned wxLongLong_t GetValue() const { return m_ll; }
+
+ // convert to ulong with range checking in the 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;
+ }
+
+ // operations
+ // addition
+ wxULongLongNative operator+(const wxULongLongNative& ll) const
+ { return wxULongLongNative(m_ll + ll.m_ll); }
+ wxULongLongNative& operator+=(const wxULongLongNative& ll)
+ { m_ll += ll.m_ll; return *this; }
+
+ wxULongLongNative operator+(const unsigned wxLongLong_t ll) const
+ { return wxULongLongNative(m_ll + ll); }
+ wxULongLongNative& operator+=(const unsigned wxLongLong_t ll)
+ { m_ll += ll; return *this; }
+
+ // pre increment
+ wxULongLongNative& operator++()
+ { m_ll++; return *this; }
+
+ // post increment
+ wxULongLongNative operator++(int)
+ { wxULongLongNative value(*this); m_ll++; return value; }
+
+ // subtraction
+ wxULongLongNative operator-(const wxULongLongNative& ll) const
+ { return wxULongLongNative(m_ll - ll.m_ll); }
+ wxULongLongNative& operator-=(const wxULongLongNative& ll)
+ { m_ll -= ll.m_ll; return *this; }
+
+ wxULongLongNative operator-(const unsigned wxLongLong_t ll) const
+ { return wxULongLongNative(m_ll - ll); }
+ wxULongLongNative& operator-=(const unsigned wxLongLong_t ll)
+ { m_ll -= ll; return *this; }
+
+ // pre decrement
+ wxULongLongNative& operator--()
+ { m_ll--; return *this; }
+
+ // post decrement
+ wxULongLongNative operator--(int)
+ { wxULongLongNative value(*this); m_ll--; return value; }
+
+ // shifts
+ // left shift
+ wxULongLongNative operator<<(int shift) const
+ { 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);; }
+ wxULongLongNative& operator>>=(int shift)
+ { m_ll >>= shift; return *this; }
+
+ // bitwise operators
+ wxULongLongNative operator&(const wxULongLongNative& ll) const
+ { return wxULongLongNative(m_ll & ll.m_ll); }
+ wxULongLongNative& operator&=(const wxULongLongNative& ll)
+ { m_ll &= ll.m_ll; return *this; }
+
+ wxULongLongNative operator|(const wxULongLongNative& ll) const
+ { return wxULongLongNative(m_ll | ll.m_ll); }
+ wxULongLongNative& operator|=(const wxULongLongNative& ll)
+ { m_ll |= ll.m_ll; return *this; }
+
+ wxULongLongNative operator^(const wxULongLongNative& ll) const
+ { return wxULongLongNative(m_ll ^ ll.m_ll); }
+ wxULongLongNative& operator^=(const wxULongLongNative& ll)
+ { m_ll ^= ll.m_ll; return *this; }
+
+ // multiplication/division
+ wxULongLongNative operator*(const wxULongLongNative& ll) const
+ { return wxULongLongNative(m_ll * ll.m_ll); }
+ wxULongLongNative operator*(unsigned long l) const
+ { return wxULongLongNative(m_ll * l); }
+ wxULongLongNative& operator*=(const wxULongLongNative& ll)
+ { m_ll *= ll.m_ll; return *this; }
+ wxULongLongNative& operator*=(unsigned long l)
+ { m_ll *= l; return *this; }
+
+ wxULongLongNative operator/(const wxULongLongNative& ll) const
+ { return wxULongLongNative(m_ll / ll.m_ll); }
+ wxULongLongNative operator/(unsigned long l) const
+ { return wxULongLongNative(m_ll / l); }
+ wxULongLongNative& operator/=(const wxULongLongNative& ll)
+ { m_ll /= ll.m_ll; return *this; }
+ wxULongLongNative& operator/=(unsigned long l)
+ { m_ll /= l; return *this; }
+
+ wxULongLongNative operator%(const wxULongLongNative& ll) const
+ { return wxULongLongNative(m_ll % ll.m_ll); }
+ wxULongLongNative operator%(unsigned long l) const
+ { return wxULongLongNative(m_ll % l); }
+
+ // comparison
+ bool operator==(const wxULongLongNative& ll) const
+ { return m_ll == ll.m_ll; }
+ bool operator==(unsigned long l) const
+ { return m_ll == l; }
+ bool operator!=(const wxULongLongNative& ll) const
+ { return m_ll != ll.m_ll; }
+ bool operator!=(unsigned long l) const
+ { return m_ll != l; }
+ bool operator<(const wxULongLongNative& ll) const
+ { return m_ll < ll.m_ll; }
+ bool operator<(unsigned long l) const
+ { return m_ll < l; }
+ bool operator>(const wxULongLongNative& ll) const
+ { return m_ll > ll.m_ll; }
+ bool operator>(unsigned long l) const
+ { return m_ll > l; }
+ bool operator<=(const wxULongLongNative& ll) const
+ { return m_ll <= ll.m_ll; }
+ bool operator<=(unsigned long l) const
+ { return m_ll <= l; }
+ bool operator>=(const wxULongLongNative& ll) const
+ { return m_ll >= ll.m_ll; }
+ bool operator>=(unsigned long l) const
+ { return m_ll >= l; }
+
+ // miscellaneous
+
+ // return the string representation of this number
+ wxString ToString() const;
+
+ // conversion to byte array: returns a pointer to static buffer!
+ void *asArray() const;
+
+#if wxUSE_STD_IOSTREAM
+ // input/output
+ friend wxSTD ostream& operator<<(wxSTD ostream&, const wxULongLongNative&);
+#endif
+
+private:
+ unsigned wxLongLong_t m_ll;
+};
+
#endif // wxUSE_LONGLONG_NATIVE
#if wxUSE_LONGLONG_WX
-class WXDLLEXPORT wxLongLongWx
+class WXDLLIMPEXP_BASE wxLongLongWx
{
public:
// ctors
// default ctor initializes to 0
- wxLongLongWx() { m_lo = m_hi = 0; }
+ wxLongLongWx()
+ {
+ m_lo = m_hi = 0;
+
+#ifdef wxLONGLONG_TEST_MODE
+ m_ll = 0;
+
+ Check();
+#endif // wxLONGLONG_TEST_MODE
+ }
// from long
- wxLongLongWx(long l)
- { m_lo = l; m_hi = (l < 0 ? -1l : 0l); }
+ wxLongLongWx(long l) { *this = l; }
// from 2 longs
wxLongLongWx(long hi, unsigned long lo)
- { m_hi = hi; m_lo = lo; }
+ {
+ m_hi = hi;
+ m_lo = lo;
+
+#ifdef wxLONGLONG_TEST_MODE
+ m_ll = hi;
+ m_ll <<= 32;
+ m_ll |= lo;
+
+ Check();
+#endif // wxLONGLONG_TEST_MODE
+ }
// default copy ctor is ok in both cases
// assignment operators
// from long
wxLongLongWx& operator=(long l)
- { m_lo = l; m_hi = (l < 0 ? -1l : 0l); return *this; }
+ {
+ m_lo = l;
+ m_hi = (l < 0 ? -1l : 0l);
+
+#ifdef wxLONGLONG_TEST_MODE
+ m_ll = l;
+
+ Check();
+#endif // wxLONGLONG_TEST_MODE
+
+ return *this;
+ }
// from double
wxLongLongWx& Assign(double d);
// can't have assignment operator from 2 longs
// get absolute value
wxLongLongWx Abs() const { return wxLongLongWx(*this).Abs(); }
- wxLongLongWx& Abs() { if ( m_hi < 0 ) m_hi = -m_hi; return *this; }
+ wxLongLongWx& Abs()
+ {
+ if ( m_hi < 0 )
+ m_hi = -m_hi;
+
+#ifdef wxLONGLONG_TEST_MODE
+ if ( m_ll < 0 )
+ m_ll = -m_ll;
+
+ Check();
+#endif // wxLONGLONG_TEST_MODE
+
+ return *this;
+ }
// convert to long with range checking in the debug mode (only!)
long ToLong() const
{
- wxASSERT_MSG( m_hi == 0l,
+ wxASSERT_MSG( (m_hi == 0l) || (m_hi == -1l),
_T("wxLongLong to long conversion loss of precision") );
return (long)m_lo;
wxLongLongWx& operator++();
// post increment operator
- wxLongLongWx& operator++(int);
+ wxLongLongWx& operator++(int) { return ++(*this); }
// negation operator
wxLongLongWx operator-() const;
+ wxLongLongWx& Negate();
// subraction
wxLongLongWx operator-(const wxLongLongWx& ll) const;
wxLongLongWx& operator--();
// post decrement operator
- wxLongLongWx& operator--(int);
+ wxLongLongWx& operator--(int) { return --(*this); }
// shifts
// left shift
bool operator>=(const wxLongLongWx& ll) const
{ return *this > ll || *this == ll; }
+ bool operator<(long l) const { return *this < wxLongLongWx(l); }
+ bool operator>(long l) const { return *this > wxLongLongWx(l); }
+ bool operator==(long l) const
+ {
+ return l >= 0 ? (m_hi == 0 && m_lo == (unsigned long)l)
+ : (m_hi == -1 && m_lo == (unsigned long)l);
+ }
+
+ bool operator<=(long l) const { return *this < l || *this == l; }
+ bool operator>=(long l) const { return *this > l || *this == l; }
+
// multiplication
wxLongLongWx operator*(const wxLongLongWx& ll) const;
wxLongLongWx& operator*=(const wxLongLongWx& ll);
wxLongLongWx& remainder) const;
// input/output
+
+ // return the string representation of this number
+ wxString ToString() const;
+
+ void *asArray() const;
+
#if wxUSE_STD_IOSTREAM
- friend ostream& operator<<(ostream&, const wxLongLongWx&);
+ friend wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongWx&);
#endif // wxUSE_STD_IOSTREAM
- void *asArray(void) const;
-
private:
// long is at least 32 bits, so represent our 64bit number as 2 longs
long m_hi; // signed bit is in the high part
unsigned long m_lo;
+
+#ifdef wxLONGLONG_TEST_MODE
+ void Check()
+ {
+ wxASSERT( (m_ll >> 32) == m_hi && (unsigned long)m_ll == m_lo );
+ }
+
+ wxLongLong_t m_ll;
+#endif // wxLONGLONG_TEST_MODE
+};
+
+
+class WXDLLIMPEXP_BASE wxULongLongWx
+{
+public:
+ // ctors
+ // default ctor initializes to 0
+ wxULongLongWx()
+ {
+ m_lo = m_hi = 0;
+
+#ifdef wxLONGLONG_TEST_MODE
+ m_ll = 0;
+
+ Check();
+#endif // wxLONGLONG_TEST_MODE
+ }
+ // from ulong
+ wxULongLongWx(unsigned long l) { *this = l; }
+ // from 2 ulongs
+ wxULongLongWx(unsigned long hi, unsigned long lo)
+ {
+ m_hi = hi;
+ m_lo = lo;
+
+#ifdef wxLONGLONG_TEST_MODE
+ m_ll = hi;
+ m_ll <<= 32;
+ m_ll |= lo;
+
+ Check();
+#endif // wxLONGLONG_TEST_MODE
+ }
+
+ // default copy ctor is ok in both cases
+
+ // no dtor
+
+ // assignment operators
+ // from long
+ wxULongLongWx& operator=(unsigned long l)
+ {
+ m_lo = l;
+ m_hi = 0;
+
+#ifdef wxLONGLONG_TEST_MODE
+ m_ll = l;
+
+ Check();
+#endif // wxLONGLONG_TEST_MODE
+
+ return *this;
+ }
+
+ // can't have assignment operator from 2 longs
+
+ // accessors
+ // get high part
+ unsigned long GetHi() const { return m_hi; }
+ // get low part
+ unsigned long GetLo() const { return m_lo; }
+
+ // convert to long with range checking in the debug mode (only!)
+ unsigned long ToULong() const
+ {
+ wxASSERT_MSG( m_hi == 0ul,
+ _T("wxULongLong to long conversion loss of precision") );
+
+ return (unsigned long)m_lo;
+ }
+
+ // operations
+ // addition
+ wxULongLongWx operator+(const wxULongLongWx& ll) const;
+ wxULongLongWx& operator+=(const wxULongLongWx& ll);
+ wxULongLongWx operator+(unsigned long l) const;
+ wxULongLongWx& operator+=(unsigned long l);
+
+ // pre increment operator
+ wxULongLongWx& operator++();
+
+ // post increment operator
+ wxULongLongWx& operator++(int) { return ++(*this); }
+
+ // subraction (FIXME: should return wxLongLong)
+ wxULongLongWx operator-(const wxULongLongWx& ll) const;
+ wxULongLongWx& operator-=(const wxULongLongWx& ll);
+
+ // pre decrement operator
+ wxULongLongWx& operator--();
+
+ // post decrement operator
+ wxULongLongWx& operator--(int) { return --(*this); }
+
+ // shifts
+ // left shift
+ wxULongLongWx operator<<(int shift) const;
+ wxULongLongWx& operator<<=(int shift);
+
+ // right shift
+ wxULongLongWx operator>>(int shift) const;
+ wxULongLongWx& operator>>=(int shift);
+
+ // bitwise operators
+ wxULongLongWx operator&(const wxULongLongWx& ll) const;
+ wxULongLongWx& operator&=(const wxULongLongWx& ll);
+ wxULongLongWx operator|(const wxULongLongWx& ll) const;
+ wxULongLongWx& operator|=(const wxULongLongWx& ll);
+ wxULongLongWx operator^(const wxULongLongWx& ll) const;
+ wxULongLongWx& operator^=(const wxULongLongWx& ll);
+ wxULongLongWx operator~() const;
+
+ // comparison
+ bool operator==(const wxULongLongWx& ll) const
+ { return m_lo == ll.m_lo && m_hi == ll.m_hi; }
+ bool operator!=(const wxULongLongWx& ll) const
+ { return !(*this == ll); }
+ bool operator<(const wxULongLongWx& ll) const;
+ bool operator>(const wxULongLongWx& ll) const;
+ bool operator<=(const wxULongLongWx& ll) const
+ { return *this < ll || *this == ll; }
+ bool operator>=(const wxULongLongWx& ll) const
+ { return *this > ll || *this == ll; }
+
+ bool operator<(unsigned long l) const { return *this < wxULongLongWx(l); }
+ bool operator>(unsigned long l) const { return *this > wxULongLongWx(l); }
+ bool operator==(unsigned long l) const
+ {
+ return (m_hi == 0 && m_lo == (unsigned long)l);
+ }
+
+ bool operator<=(unsigned long l) const { return *this < l || *this == l; }
+ bool operator>=(unsigned long l) const { return *this > l || *this == l; }
+
+ // multiplication
+ wxULongLongWx operator*(const wxULongLongWx& ll) const;
+ wxULongLongWx& operator*=(const wxULongLongWx& ll);
+
+ // division
+ wxULongLongWx operator/(const wxULongLongWx& ll) const;
+ wxULongLongWx& operator/=(const wxULongLongWx& ll);
+
+ wxULongLongWx operator%(const wxULongLongWx& ll) const;
+
+ void Divide(const wxULongLongWx& divisor,
+ wxULongLongWx& quotient,
+ wxULongLongWx& remainder) const;
+
+ // input/output
+
+ // return the string representation of this number
+ wxString ToString() const;
+
+ void *asArray() const;
+
+#if wxUSE_STD_IOSTREAM
+ friend wxSTD ostream& operator<<(wxSTD ostream&, const wxULongLongWx&);
+#endif // wxUSE_STD_IOSTREAM
+
+private:
+ // long is at least 32 bits, so represent our 64bit number as 2 longs
+
+ unsigned long m_hi;
+ unsigned long m_lo;
+
+#ifdef wxLONGLONG_TEST_MODE
+ void Check()
+ {
+ wxASSERT( (m_ll >> 32) == m_hi && (unsigned long)m_ll == m_lo );
+ }
+
+ unsigned wxLongLong_t m_ll;
+#endif // wxLONGLONG_TEST_MODE
};
#endif // wxUSE_LONGLONG_WX
// binary operators
// ----------------------------------------------------------------------------
-inline bool WXDLLEXPORT operator<(long l, const wxLongLong& ll) { return ll > l; }
-inline bool WXDLLEXPORT operator>(long l, const wxLongLong& ll) { return ll > l; }
-inline bool WXDLLEXPORT operator<=(long l, const wxLongLong& ll) { return ll > l; }
-inline bool WXDLLEXPORT operator>=(long l, const wxLongLong& ll) { return ll > l; }
-inline bool WXDLLEXPORT operator==(long l, const wxLongLong& ll) { return ll > l; }
-inline bool WXDLLEXPORT 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 wxLongLong(l) - ll;
+}
-inline wxLongLong WXDLLEXPORT operator+(long l, const wxLongLong& ll) { return ll + l; }
-inline wxLongLong WXDLLEXPORT operator-(long l, const wxLongLong& ll) { return ll - 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& ull) { return ull != l; }
+
+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)
+{
+ return wxULongLong(l) - ull;
+}
#endif // _WX_LONGLONG_H
projects / wxWidgets.git / blobdiff