trunk/branch integration: bugfix

This commit is contained in:
Marian Krivos
2011-08-23 06:37:32 +00:00
parent ab4ddb75d5
commit a74e3c6be7

View File

@@ -158,12 +158,11 @@ inline AtomicCounter::ValueType AtomicCounter::operator ++ () // prefix
return InterlockedIncrement(&_counter); return InterlockedIncrement(&_counter);
} }
inline AtomicCounter::ValueType AtomicCounter::operator ++ (int) // postfix inline AtomicCounter::ValueType AtomicCounter::operator ++ (int) // postfix
{ {
ValueType result(_counter); ValueType result = InterlockedIncrement(&_counter);
InterlockedIncrement(&_counter); return --result;
return result;
} }
@@ -172,15 +171,14 @@ inline AtomicCounter::ValueType AtomicCounter::operator -- () // prefix
return InterlockedDecrement(&_counter); return InterlockedDecrement(&_counter);
} }
inline AtomicCounter::ValueType AtomicCounter::operator -- (int) // postfix inline AtomicCounter::ValueType AtomicCounter::operator -- (int) // postfix
{ {
ValueType result(_counter); ValueType result = InterlockedDecrement(&_counter);
InterlockedDecrement(&_counter); return ++result;
return result;
} }
inline bool AtomicCounter::operator ! () const inline bool AtomicCounter::operator ! () const
{ {
return _counter == 0; return _counter == 0;
@@ -208,12 +206,11 @@ inline AtomicCounter::ValueType AtomicCounter::operator ++ () // prefix
return OSAtomicIncrement32(&_counter); return OSAtomicIncrement32(&_counter);
} }
inline AtomicCounter::ValueType AtomicCounter::operator ++ (int) // postfix inline AtomicCounter::ValueType AtomicCounter::operator ++ (int) // postfix
{ {
ValueType result(_counter); ValueType result = OSAtomicIncrement32(&_counter);
OSAtomicIncrement32(&_counter); return --result;
return result;
} }
@@ -222,15 +219,14 @@ inline AtomicCounter::ValueType AtomicCounter::operator -- () // prefix
return OSAtomicDecrement32(&_counter); return OSAtomicDecrement32(&_counter);
} }
inline AtomicCounter::ValueType AtomicCounter::operator -- (int) // postfix inline AtomicCounter::ValueType AtomicCounter::operator -- (int) // postfix
{ {
ValueType result(_counter); ValueType result = OSAtomicDecrement32(&_counter);
OSAtomicDecrement32(&_counter); return ++result;
return result;
} }
inline bool AtomicCounter::operator ! () const inline bool AtomicCounter::operator ! () const
{ {
return _counter == 0; return _counter == 0;