Skip to content

Commit 96c854b

Browse files
committed
[atomics.syn] Move namespace-scope memory_order_* variables here
1 parent 2bfa7c4 commit 96c854b

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

source/threads.tex

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2049,6 +2049,13 @@
20492049
namespace std {
20502050
// \ref{atomics.order}, order and consistency
20512051
enum class memory_order : @\unspec@;
2052+
inline constexpr memory_order memory_order_relaxed = memory_order::relaxed;
2053+
inline constexpr memory_order memory_order_consume = memory_order::consume;
2054+
inline constexpr memory_order memory_order_acquire = memory_order::acquire;
2055+
inline constexpr memory_order memory_order_release = memory_order::release;
2056+
inline constexpr memory_order memory_order_acq_rel = memory_order::acq_rel;
2057+
inline constexpr memory_order memory_order_seq_cst = memory_order::seq_cst;
2058+
20522059
template<class T>
20532060
T kill_dependency(T y) noexcept;
20542061
}
@@ -2397,12 +2404,6 @@
23972404
enum class memory_order : @\unspec@ {
23982405
relaxed, consume, acquire, release, acq_rel, seq_cst
23992406
};
2400-
inline constexpr memory_order memory_order_relaxed = memory_order::relaxed;
2401-
inline constexpr memory_order memory_order_consume = memory_order::consume;
2402-
inline constexpr memory_order memory_order_acquire = memory_order::acquire;
2403-
inline constexpr memory_order memory_order_release = memory_order::release;
2404-
inline constexpr memory_order memory_order_acq_rel = memory_order::acq_rel;
2405-
inline constexpr memory_order memory_order_seq_cst = memory_order::seq_cst;
24062407
}
24072408
\end{codeblock}
24082409

0 commit comments

Comments
 (0)