summaryrefslogtreecommitdiffstats
path: root/libcxx/include
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2012-09-16 20:33:09 +0000
committerHoward Hinnant <hhinnant@apple.com>2012-09-16 20:33:09 +0000
commita0bc10dca6f210262edbaca848e23590ff97411f (patch)
tree40e03b059595800c01fd494c7dbab7b453eaf920 /libcxx/include
parent9712117a075641477762ba3300624840d92f1fb1 (diff)
downloadbcm5719-llvm-a0bc10dca6f210262edbaca848e23590ff97411f.tar.gz
bcm5719-llvm-a0bc10dca6f210262edbaca848e23590ff97411f.zip
Align <atomic> with clang r163964 which disallows const _Atomic types.
llvm-svn: 164004
Diffstat (limited to 'libcxx/include')
-rw-r--r--libcxx/include/atomic2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/atomic b/libcxx/include/atomic
index 6a200eba599..6dffdb21fde 100644
--- a/libcxx/include/atomic
+++ b/libcxx/include/atomic
@@ -555,7 +555,7 @@ kill_dependency(_Tp __y) _NOEXCEPT
template <class _Tp, bool = is_integral<_Tp>::value && !is_same<_Tp, bool>::value>
struct __atomic_base // false
{
- _Atomic(_Tp) __a_;
+ mutable _Atomic(_Tp) __a_;
_LIBCPP_INLINE_VISIBILITY
bool is_lock_free() const volatile _NOEXCEPT
OpenPOWER on IntegriCloud