summaryrefslogtreecommitdiffstats
path: root/libcxx/src
diff options
context:
space:
mode:
authorBen Craig <ben.craig@codeaurora.org>2016-08-02 13:43:48 +0000
committerBen Craig <ben.craig@codeaurora.org>2016-08-02 13:43:48 +0000
commit8ddd3ef9c9eb13f3072390a4a2d1dd36d399e6ad (patch)
tree485bf1385270e97beac75eeb8c4568e87094b5c0 /libcxx/src
parent2f882d7a8ffd74c93f102a9b9ee43288084910d8 (diff)
downloadbcm5719-llvm-8ddd3ef9c9eb13f3072390a4a2d1dd36d399e6ad.tar.gz
bcm5719-llvm-8ddd3ef9c9eb13f3072390a4a2d1dd36d399e6ad.zip
Fixing 'Aquire' typo and libcxx build.
llvm-svn: 277456
Diffstat (limited to 'libcxx/src')
-rw-r--r--libcxx/src/include/atomic_support.h2
-rw-r--r--libcxx/src/memory.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/src/include/atomic_support.h b/libcxx/src/include/atomic_support.h
index 8b719c5f221..af0f5f505ea 100644
--- a/libcxx/src/include/atomic_support.h
+++ b/libcxx/src/include/atomic_support.h
@@ -45,7 +45,7 @@ namespace {
enum __libcpp_atomic_order {
_AO_Relaxed = __ATOMIC_RELAXED,
_AO_Consume = __ATOMIC_CONSUME,
- _AO_Aquire = __ATOMIC_ACQUIRE,
+ _AO_Acquire = __ATOMIC_ACQUIRE,
_AO_Release = __ATOMIC_RELEASE,
_AO_Acq_Rel = __ATOMIC_ACQ_REL,
_AO_Seq = __ATOMIC_SEQ_CST
diff --git a/libcxx/src/memory.cpp b/libcxx/src/memory.cpp
index b9a741b23f4..b685d125ba9 100644
--- a/libcxx/src/memory.cpp
+++ b/libcxx/src/memory.cpp
@@ -117,7 +117,7 @@ __shared_weak_count::__release_weak() _NOEXCEPT
// threads, and have them all get copied at once. The argument
// also doesn't apply for __release_shared, because an outstanding
// weak_ptr::lock() could read / modify the shared count.
- if (__libcpp_atomic_load(&__shared_weak_owners_, _AO_Aquire) == 0)
+ if (__libcpp_atomic_load(&__shared_weak_owners_, _AO_Acquire) == 0)
{
// no need to do this store, because we are about
// to destroy everything.
OpenPOWER on IntegriCloud