// Author: Jeffrey C. Ollie <jeff@ollie.clive.ia.us>, Vadim Zeitlin
// 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__
- #pragma interface "longlong.h"
-#endif
-
#include "wx/defs.h"
+
+#if wxUSE_LONGLONG
+
#include "wx/string.h"
#include <limits.h> // for LONG_MAX
// 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
-#elif defined(__DJGPP__) && __DJGPP__ >= 2
- #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
// <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
+ #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
#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
#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
// ----------------------------------------------------------------------------
// 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(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
// 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
// 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(); }
// 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") );
+ wxT("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; }
{ 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
{ 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
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; }
#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:
};
-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(wxULongLong_t ll) : m_ll(ll) { }
// from 2 longs
- wxULongLongNative(unsigned long hi, unsigned long lo)
+ 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") );
+ wxASSERT_MSG( m_ll <= ULONG_MAX,
+ wxT("wxULongLong to long conversion loss of precision") );
- return (unsigned long)m_ll;
+ return wx_truncate_cast(unsigned long, m_ll);
}
+ // convert to double
+ //
+ // For some completely obscure reasons compiling the cast below with
+ // VC6 in DLL builds only (!) results in "error C2520: conversion from
+ // unsigned __int64 to double not implemented, use signed __int64" so
+ // we must use a different version for that compiler.
+#ifdef __VISUALC6__
+ double ToDouble() const;
+#else
+ double ToDouble() const { return wx_truncate_cast(double, m_ll); }
+#endif
+
// operations
// addition
wxULongLongNative operator+(const wxULongLongNative& ll) const
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
{ 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
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
{ 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
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; }
#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
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
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),
- _T("wxLongLong to long conversion loss of precision") );
+ wxT("wxLongLong to long conversion loss of precision") );
return (long)m_lo;
}
+ // convert to double
+ double ToDouble() const;
+
// operations
// addition
wxLongLongWx operator+(const wxLongLongWx& ll) const;
// 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;
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
};
-class WXDLLEXPORT wxULongLongWx
+class WXDLLIMPEXP_BASE wxULongLongWx
{
public:
// ctors
#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
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
// 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,
- _T("wxULongLong to long conversion loss of precision") );
+ wxT("wxULongLong to long conversion loss of precision") );
return (unsigned long)m_lo;
}
+ // convert to double
+ double ToDouble() const;
+
// operations
// addition
wxULongLongWx operator+(const wxULongLongWx& ll) const;
// 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
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
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
};
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((wxInt32)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
+
+// ----------------------------------------------------------------------------
+// Specialize numeric_limits<> for our long long wrapper classes.
+// ----------------------------------------------------------------------------
+
+#if wxUSE_LONGLONG_NATIVE
+
+// VC6 is known to not have __int64 specializations of numeric_limits<> in its
+// <limits> anyhow so don't bother including it, especially as it results in
+// tons of warnings because the standard header itself uses obsolete template
+// specialization syntax.
+#ifndef __VISUALC6__
+
+#include <limits>
+
+namespace std
+{
+
+#ifdef __clang__
+ // libstdc++ (used by Clang) uses struct for numeric_limits; unlike gcc, clang
+ // warns about this
+ template<> struct numeric_limits<wxLongLong> : public numeric_limits<wxLongLong_t> {};
+ template<> struct numeric_limits<wxULongLong> : public numeric_limits<wxULongLong_t> {};
+#else
+ template<> class numeric_limits<wxLongLong> : public numeric_limits<wxLongLong_t> {};
+ template<> class numeric_limits<wxULongLong> : public numeric_limits<wxULongLong_t> {};
+#endif
+
+} // namespace std
+
+#endif // !VC6
+
+#endif // wxUSE_LONGLONG_NATIVE
+
+// ----------------------------------------------------------------------------
+// Specialize wxArgNormalizer to allow using wxLongLong directly with wx pseudo
+// vararg functions.
+// ----------------------------------------------------------------------------
+
+// Notice that this must be done here and not in wx/strvararg.h itself because
+// we can't include wx/longlong.h from there as this header itself includes
+// wx/string.h which includes wx/strvararg.h too, so to avoid the circular
+// dependencies we can only do it here (or add another header just for this but
+// it doesn't seem necessary).
+#include "wx/strvararg.h"
+
+template<>
+struct WXDLLIMPEXP_BASE wxArgNormalizer<wxLongLong>
+{
+ wxArgNormalizer(wxLongLong value,
+ const wxFormatString *fmt, unsigned index)
+ : m_value(value)
+ {
+ wxASSERT_ARG_TYPE( fmt, index, wxFormatString::Arg_LongLongInt );
+ }
+
+ wxLongLong_t get() const { return m_value.GetValue(); }
+
+ wxLongLong m_value;
+};
+
+#endif // wxUSE_LONGLONG
+
#endif // _WX_LONGLONG_H
projects / wxWidgets.git / blobdiff