Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

really fixed wxLongLong

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-12-02 00:08:21 +00:00
parent b01fb5c340
commit d7997e1ab1
1 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
include/wx/longlong.h
View File

@@ -177,11 +177,6 @@ public:
// convert to native long long // convert to native long long
wxLongLong_t GetValue() const { return m_ll; } 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!) // convert to long with range checking in the debug mode (only!)
long ToLong() const long ToLong() const
{ {
@@ -383,10 +378,6 @@ public:
return (unsigned long)m_ll; 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 // operations
// addition // addition
wxULongLongNative operator+(const wxULongLongNative& ll) const wxULongLongNative operator+(const wxULongLongNative& ll) const
@@ -786,7 +777,7 @@ public:
// convert to long with range checking in the debug mode (only!) // convert to long with range checking in the debug mode (only!)
unsigned long ToULong() const unsigned long ToULong() const
{ {
wxASSERT_MSG( (m_hi == 0l), wxASSERT_MSG( m_hi == 0ul,
_T("wxULongLong to long conversion loss of precision") ); _T("wxULongLong to long conversion loss of precision") );
return (unsigned long)m_lo; return (unsigned long)m_lo;
@@ -805,7 +796,7 @@ public:
// post increment operator // post increment operator
wxULongLongWx& operator++(int) { return ++(*this); } wxULongLongWx& operator++(int) { return ++(*this); }
// subraction // subraction (FIXME: should return wxLongLong)
wxULongLongWx operator-(const wxULongLongWx& ll) const; wxULongLongWx operator-(const wxULongLongWx& ll) const;
wxULongLongWx& operator-=(const wxULongLongWx& ll); wxULongLongWx& operator-=(const wxULongLongWx& ll);
@@ -903,30 +894,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 bool operator!=(long l, const wxLongLong& ll) { return ll != l; }
inline wxLongLong operator+(long l, const wxLongLong& ll)
{
return ll + wxLongLong(l);
}
inline wxLongLong operator+(long l, const wxLongLong& ll) { return ll + l; }
inline wxLongLong operator-(long l, const wxLongLong& ll) inline wxLongLong operator-(long l, const wxLongLong& ll)
{ {
return ll - wxLongLong(l); return wxLongLong(l) - ll;
} }
inline bool operator<(unsigned long l, const wxULongLong& ll) { return ll > 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& ull) { return ull < l; }
inline bool operator<=(unsigned long l, const wxULongLong& ll) { return ll > 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& ull) { return ull <= l; }
inline bool operator==(unsigned long l, const wxULongLong& ll) { return ll > 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& ull) { return ull != l; }
inline wxULongLong 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; }
// FIXME: this should return wxLongLong
inline wxULongLong operator-(unsigned long l, const wxULongLong& ull)
{
return wxULongLong(l) - ull;
}
#endif // _WX_LONGLONG_H #endif // _WX_LONGLONG_H