The "expected" value is now atomically returned from "AtomicBase<>::CompareAndSwap".

5c0c0f95 · Danila Klimenko · 7c313f90 · 5c0c0f95
Commit 5c0c0f95 authored Jun 16, 2015 by Danila Klimenko
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 2 deletions

base_cpp/include/embb/base/internal/atomic/atomic_base.h
+1 -2

No files found.
--- a/base_cpp/include/embb/base/internal/atomic/atomic_base.h
+++ b/base_cpp/include/embb/base/internal/atomic/atomic_base.h
@@ -177,8 +177,7 @@ CompareAndSwap(BaseType& expected, BaseType desired) {
    compare_and_swap(&AtomicValue, &native_expected, native_desired)) !=0
    ? true : false;

-  if (!return_val)
-    expected = Load();
+  memcpy(&expected, &native_expected, sizeof(expected));

  return return_val;
 }