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

@@ -161,9 +161,8 @@ inline AtomicCounter::ValueType AtomicCounter::operator ++ () // prefix
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;
} }
@@ -175,9 +174,8 @@ inline AtomicCounter::ValueType AtomicCounter::operator -- () // prefix
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;
} }
@@ -211,9 +209,8 @@ inline AtomicCounter::ValueType AtomicCounter::operator ++ () // prefix
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;
} }
@@ -225,9 +222,8 @@ inline AtomicCounter::ValueType AtomicCounter::operator -- () // prefix
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;
} }