maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[libc++] Do not specify the underlying type of memory_order 

Summary:
This breaks ABI for folks using -fshort-enums, and does not really buy
us anything.

http://llvm.org/PR40977

Reviewers: mclow.lists, EricWF

Subscribers: christof, jkorous, dexonsmith, libcxx-commits, zoecarver

Differential Revision: https://reviews.llvm.org/D59029

llvm-svn: 355521
This commit is contained in:
Louis Dionne 2019-03-06 17:07:24 +00:00
parent 67f36903ae
commit 930007ba76
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libcxx/include/atomic
View File

@ -586,7 +586,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
#if _LIBCPP_STD_VER > 17
enum class memory_order: unsigned {
enum class memory_order {
relaxed, consume, acquire, release, acq_rel, seq_cst
};
@ -597,9 +597,6 @@ inline constexpr auto memory_order_release = memory_order::release;
inline constexpr auto memory_order_acq_rel = memory_order::acq_rel;
inline constexpr auto memory_order_seq_cst = memory_order::seq_cst;
static_assert((is_same<underlying_type<memory_order>::type,
unsigned>::value), "Underlying type differs from unsigned unexpectedly");
#else
typedef enum memory_order {
@ -607,12 +604,9 @@ typedef enum memory_order {
memory_order_release, memory_order_acq_rel, memory_order_seq_cst
} memory_order;
static_assert((is_same<underlying_type<memory_order>::type,
unsigned>::value), "Underlying type differs from unsigned unexpectedly");
#endif // _LIBCPP_STD_VER > 17
typedef underlying_type<memory_order>::type __memory_order_underlying_t; // unsigned
typedef underlying_type<memory_order>::type __memory_order_underlying_t;
#if defined(_LIBCPP_HAS_GCC_ATOMIC_IMP) || \