X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6058220154150a2f60b09198a444411873050e52..c493691d6249650c0366fd9aaaca8572e3ff3edd:/include/wx/longlong.h diff --git a/include/wx/longlong.h b/include/wx/longlong.h index 5670a66fab..e8c399960b 100644 --- a/include/wx/longlong.h +++ b/include/wx/longlong.h @@ -164,6 +164,11 @@ public: return (long)m_ll; } +#if wxABI_VERSION >= 20602 + // convert to double + double ToDouble() const { return m_ll; } +#endif // ABI >= 2.6.2 + // 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; } @@ -215,13 +220,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; } @@ -402,13 +407,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; } @@ -590,6 +595,11 @@ public: return (long)m_lo; } +#if wxABI_VERSION >= 20602 + // convert to double + double ToDouble() const; +#endif // ABI >= 2.6.2 + // operations // addition wxLongLongWx operator+(const wxLongLongWx& ll) const; @@ -798,7 +808,7 @@ public: // post increment operator wxULongLongWx& operator++(int) { return ++(*this); } - // substraction + // subtraction wxLongLongWx operator-(const wxULongLongWx& ll) const; wxULongLongWx& operator-=(const wxULongLongWx& ll);