summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2015-05-27 11:36:58 +0200
committerJose <jose@zeroc.com>2015-05-27 11:36:58 +0200
commitec80b14919e81e3b7c99a1442d7f857074bf0306 (patch)
tree3c119e5617cc5d5eac49218b18c2e48d91c3478c
parentBetter fix to figure out location of slice2py on Linux platforms (diff)
downloadice-ec80b14919e81e3b7c99a1442d7f857074bf0306.tar.bz2
ice-ec80b14919e81e3b7c99a1442d7f857074bf0306.tar.xz
ice-ec80b14919e81e3b7c99a1442d7f857074bf0306.zip
Atomic.h exchange must return the original value
-rw-r--r--cpp/include/IceUtil/Atomic.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/include/IceUtil/Atomic.h b/cpp/include/IceUtil/Atomic.h
index 070f4c9581c..dcf705bb612 100644
--- a/cpp/include/IceUtil/Atomic.h
+++ b/cpp/include/IceUtil/Atomic.h
@@ -137,7 +137,7 @@ public:
IceUtil::Mutex::Lock sync(_mutex);
int tmp = _ref;
_ref = value;
- return _ref;
+ return tmp;
#endif
}