generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix GCC atomic implementation in C++03

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@250279 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier 2015-10-14 08:36:22 +00:00
parent a6622799b4
commit a4ae16b67a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/atomic
View File

@ -552,7 +552,12 @@ typedef enum memory_order
namespace __gcc_atomic { namespace __gcc_atomic {
template <typename _Tp> template <typename _Tp>
struct __gcc_atomic_t { struct __gcc_atomic_t {
__gcc_atomic_t() _NOEXCEPT {} _LIBCPP_INLINE_VISIBILITY
#ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
__gcc_atomic_t() _NOEXCEPT = default;
#else
__gcc_atomic_t() _NOEXCEPT : __a_value() {}
#endif // _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
_LIBCPP_CONSTEXPR explicit __gcc_atomic_t(_Tp value) _NOEXCEPT _LIBCPP_CONSTEXPR explicit __gcc_atomic_t(_Tp value) _NOEXCEPT
: __a_value(value) {} : __a_value(value) {}
_Tp __a_value; _Tp __a_value;
@ -573,7 +578,7 @@ struct __can_assign {
sizeof(__test_atomic_assignable<_Tp, _Td>(1)) == sizeof(char); sizeof(__test_atomic_assignable<_Tp, _Td>(1)) == sizeof(char);
}; };
static inline constexpr int __to_gcc_order(memory_order __order) { static inline _LIBCPP_CONSTEXPR int __to_gcc_order(memory_order __order) {
// Avoid switch statement to make this a constexpr. // Avoid switch statement to make this a constexpr.
return __order == memory_order_relaxed ? __ATOMIC_RELAXED: return __order == memory_order_relaxed ? __ATOMIC_RELAXED:
(__order == memory_order_acquire ? __ATOMIC_ACQUIRE: (__order == memory_order_acquire ? __ATOMIC_ACQUIRE:
@ -583,7 +588,7 @@ static inline constexpr int __to_gcc_order(memory_order __order) {
__ATOMIC_CONSUME)))); __ATOMIC_CONSUME))));
} }
static inline constexpr int __to_gcc_failure_order(memory_order __order) { static inline _LIBCPP_CONSTEXPR int __to_gcc_failure_order(memory_order __order) {
// Avoid switch statement to make this a constexpr. // Avoid switch statement to make this a constexpr.
return __order == memory_order_relaxed ? __ATOMIC_RELAXED: return __order == memory_order_relaxed ? __ATOMIC_RELAXED:
(__order == memory_order_acquire ? __ATOMIC_ACQUIRE: (__order == memory_order_acquire ? __ATOMIC_ACQUIRE: