corrected post increment operators which must return value before increment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -137,11 +137,11 @@ class WXDLLEXPORT wxLongLongNative
|
|||||||
public:
|
public:
|
||||||
// ctors
|
// ctors
|
||||||
// default ctor initializes to 0
|
// default ctor initializes to 0
|
||||||
wxLongLongNative() { m_ll = 0; }
|
wxLongLongNative() : m_ll(0) { }
|
||||||
// from long long
|
// from long long
|
||||||
wxLongLongNative(wxLongLong_t ll) { m_ll = ll; }
|
wxLongLongNative(wxLongLong_t ll) : m_ll(ll) { }
|
||||||
// from 2 longs
|
// from 2 longs
|
||||||
wxLongLongNative(long hi, unsigned long lo)
|
wxLongLongNative(long hi, unsigned long lo) : m_ll(0)
|
||||||
{
|
{
|
||||||
// assign first to avoid precision loss!
|
// assign first to avoid precision loss!
|
||||||
m_ll = ((wxLongLong_t) hi) << 32;
|
m_ll = ((wxLongLong_t) hi) << 32;
|
||||||
@@ -210,8 +210,8 @@ public:
|
|||||||
{ m_ll++; return *this; }
|
{ m_ll++; return *this; }
|
||||||
|
|
||||||
// post increment
|
// post increment
|
||||||
wxLongLongNative& operator++(int)
|
wxLongLongNative operator++(int)
|
||||||
{ m_ll++; return *this; }
|
{ wxLongLongNative value(*this); m_ll++; return value; }
|
||||||
|
|
||||||
// negation operator
|
// negation operator
|
||||||
wxLongLongNative operator-() const
|
wxLongLongNative operator-() const
|
||||||
@@ -234,8 +234,8 @@ public:
|
|||||||
{ m_ll--; return *this; }
|
{ m_ll--; return *this; }
|
||||||
|
|
||||||
// post decrement
|
// post decrement
|
||||||
wxLongLongNative& operator--(int)
|
wxLongLongNative operator--(int)
|
||||||
{ m_ll--; return *this; }
|
{ wxLongLongNative value(*this); m_ll--; return value; }
|
||||||
|
|
||||||
// shifts
|
// shifts
|
||||||
// left shift
|
// left shift
|
||||||
@@ -339,11 +339,11 @@ class WXDLLEXPORT wxULongLongNative
|
|||||||
public:
|
public:
|
||||||
// ctors
|
// ctors
|
||||||
// default ctor initializes to 0
|
// default ctor initializes to 0
|
||||||
wxULongLongNative() { m_ll = 0; }
|
wxULongLongNative() : m_ll(0) { }
|
||||||
// from long long
|
// from long long
|
||||||
wxULongLongNative(unsigned wxLongLong_t ll) { m_ll = ll; }
|
wxULongLongNative(unsigned wxLongLong_t ll) : m_ll(ll) { }
|
||||||
// from 2 longs
|
// 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!
|
// assign first to avoid precision loss!
|
||||||
m_ll = ((unsigned wxLongLong_t) hi) << 32;
|
m_ll = ((unsigned wxLongLong_t) hi) << 32;
|
||||||
@@ -398,8 +398,8 @@ public:
|
|||||||
{ m_ll++; return *this; }
|
{ m_ll++; return *this; }
|
||||||
|
|
||||||
// post increment
|
// post increment
|
||||||
wxULongLongNative& operator++(int)
|
wxULongLongNative operator++(int)
|
||||||
{ m_ll++; return *this; }
|
{ wxULongLongNative value(*this); m_ll++; return value; }
|
||||||
|
|
||||||
// subtraction
|
// subtraction
|
||||||
wxULongLongNative operator-(const wxULongLongNative& ll) const
|
wxULongLongNative operator-(const wxULongLongNative& ll) const
|
||||||
@@ -417,8 +417,8 @@ public:
|
|||||||
{ m_ll--; return *this; }
|
{ m_ll--; return *this; }
|
||||||
|
|
||||||
// post decrement
|
// post decrement
|
||||||
wxULongLongNative& operator--(int)
|
wxULongLongNative operator--(int)
|
||||||
{ m_ll--; return *this; }
|
{ wxULongLongNative value(*this); m_ll--; return value; }
|
||||||
|
|
||||||
// shifts
|
// shifts
|
||||||
// left shift
|
// left shift
|
||||||
|
Reference in New Issue
Block a user