diff options
| author | Eric Fiselier <eric@efcs.ca> | 2015-07-14 17:50:27 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2015-07-14 17:50:27 +0000 |
| commit | 092c475e250af64e7b9ba459067d43cb71fb6dfd (patch) | |
| tree | 6c2533a1755a5e2af6c4980ddb02325b121bf585 /libcxx/include/atomic | |
| parent | 6c363ed67a58565623857297657e81db303b09da (diff) | |
| download | bcm5719-llvm-092c475e250af64e7b9ba459067d43cb71fb6dfd.tar.gz bcm5719-llvm-092c475e250af64e7b9ba459067d43cb71fb6dfd.zip | |
Fix PR24114 - std::atomic for non-Clang is not a literal type
Add _LIBCPP_CONSTEXPR to the implementation of __gcc_atomic_t.
llvm-svn: 242172
Diffstat (limited to 'libcxx/include/atomic')
| -rw-r--r-- | libcxx/include/atomic | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libcxx/include/atomic b/libcxx/include/atomic index 5bc71f0032b..97a998d3363 100644 --- a/libcxx/include/atomic +++ b/libcxx/include/atomic @@ -554,7 +554,8 @@ namespace __gcc_atomic { template <typename _Tp> struct __gcc_atomic_t { __gcc_atomic_t() _NOEXCEPT {} - explicit __gcc_atomic_t(_Tp value) _NOEXCEPT : __a_value(value) {} + _LIBCPP_CONSTEXPR explicit __gcc_atomic_t(_Tp value) _NOEXCEPT + : __a_value(value) {} _Tp __a_value; }; #define _Atomic(x) __gcc_atomic::__gcc_atomic_t<x> |
