commit 3e5cf305db800b2989ad57b7cde8fb3cc9fa1b9e
author Ian Rogers <irogers@google.com> Tue May 20 16:40:37 2014 -0700
committer Ian Rogers <irogers@google.com> Tue May 20 21:17:03 2014 -0700
tree 52a737323ebd505cf37ca0e4b2dcee6524fba07f
parent 27a2b70f612af9afc0fb5392fb10059f6a0a3569

Begin migration of art::Atomic to std::atomic.

Change-Id: I4858d9cbed95e5ca560956b9dabd976cebe68333

runtime/mirror/object.cc

diff --git a/runtime/mirror/object.cc b/runtime/mirror/object.cc
index 04905a5..69e5a84 100644
--- a/runtime/mirror/object.cc
+++ b/runtime/mirror/object.cc
@@ -139,10 +139,10 @@
   static AtomicInteger seed(987654321 + std::time(nullptr));
   int32_t expected_value, new_value;
   do {
-    expected_value = static_cast<uint32_t>(seed.Load());
+    expected_value = static_cast<uint32_t>(seed.LoadRelaxed());
     new_value = expected_value * 1103515245 + 12345;
   } while ((expected_value & LockWord::kHashMask) == 0 ||
-      !seed.CompareAndSwap(expected_value, new_value));
+      !seed.CompareExchangeWeakRelaxed(expected_value, new_value));
   return expected_value & LockWord::kHashMask;
 }