am 4aa38919: am 2d111d9e: Merge "Make memory_order_acquire visible in global namespace"

* commit '4aa389193e79d98754f928f9a3624c6c3fffe2ca':
  Make memory_order_acquire visible in global namespace
This commit is contained in:
Hans Boehm 2014-10-01 19:27:12 +00:00 committed by Android Git Automerger
commit b24442611c

View File

@ -89,6 +89,7 @@ using std::atomic_signal_fence;
using std::memory_order; using std::memory_order;
using std::memory_order_relaxed; using std::memory_order_relaxed;
using std::memory_order_consume; using std::memory_order_consume;
using std::memory_order_acquire;
using std::memory_order_release; using std::memory_order_release;
using std::memory_order_acq_rel; using std::memory_order_acq_rel;
using std::memory_order_seq_cst; using std::memory_order_seq_cst;