Skip to content

Commit 837d6c9

Browse files
Dani-Hubtkoeppe
Dani-Hub
authored and
tkoeppe
committed
[atomics] Reword preconditions on memory_order values in a positive form
1 parent 8845a37 commit 837d6c9

File tree

1 file changed

+85
-37
lines changed

1 file changed

+85
-37
lines changed

‎source/threads.tex

Lines changed: 85 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2968,10 +2968,10 @@
29682968
\begin{itemdescr}
29692969
\pnum
29702970
\expects
2971-
The \tcode{order} argument is neither
2972-
\tcode{memory_order::consume},
2973-
\tcode{memory_order::acquire}, nor
2974-
\tcode{memory_order::acq_rel}.
2971+
\tcode{order} is
2972+
\tcode{memory_order::relaxed},
2973+
\tcode{memory_order::release}, or
2974+
\tcode{memory_order::seq_cst}.
29752975

29762976
\pnum
29772977
\effects
@@ -3009,8 +3009,11 @@
30093009
\begin{itemdescr}
30103010
\pnum
30113011
\expects
3012-
The \tcode{order} argument is neither
3013-
\tcode{memory_order::release} nor \tcode{memory_order::acq_rel}.
3012+
\tcode{order} is
3013+
\tcode{memory_order::relaxed},
3014+
\tcode{memory_order::consume},
3015+
\tcode{memory_order::ac-\linebreak quire}, or
3016+
\tcode{memory_order::seq_cst}.
30143017

30153018
\pnum
30163019
\effects
@@ -3082,8 +3085,11 @@
30823085
\begin{itemdescr}
30833086
\pnum
30843087
\expects
3085-
The \tcode{failure} argument is neither
3086-
\tcode{memory_order::release} nor \tcode{memory_order::acq_rel}.
3088+
\tcode{failure} is
3089+
\tcode{memory_order::relaxed},
3090+
\tcode{memory_order::consume},
3091+
\tcode{memory_order::ac\-quire}, or
3092+
\tcode{memory_order::seq_cst}.
30873093

30883094
\pnum
30893095
\effects
@@ -3147,7 +3153,10 @@
31473153
\pnum
31483154
\expects
31493155
\tcode{order} is
3150-
neither \tcode{memory_order::release} nor \tcode{memory_order::acq_rel}.
3156+
\tcode{memory_order::relaxed},
3157+
\tcode{memory_order::consume},
3158+
\tcode{memory_order::ac- \linebreak quire}, or
3159+
\tcode{memory_order::seq_cst}.
31513160

31523161
\pnum
31533162
\effects
@@ -3814,8 +3823,10 @@
38143823

38153824
\pnum
38163825
\expects
3817-
The \tcode{order} argument is neither \tcode{memory_order::consume},
3818-
\tcode{memory_order::acquire}, nor \tcode{memory_order::acq_rel}.
3826+
\tcode{order} is
3827+
\tcode{memory_order::relaxed},
3828+
\tcode{memory_order::release}, or
3829+
\tcode{memory_order::seq_cst}.
38193830

38203831
\pnum
38213832
\effects
@@ -3867,7 +3878,11 @@
38673878

38683879
\pnum
38693880
\expects
3870-
The \tcode{order} argument is neither \tcode{memory_order::release} nor \tcode{memory_order::acq_rel}.
3881+
\tcode{order} is
3882+
\tcode{memory_order::relaxed},
3883+
\tcode{memory_order::consume},
3884+
\tcode{memory_order::ac-\linebreak quire}, or
3885+
\tcode{memory_order::seq_cst}.
38713886

38723887
\pnum
38733888
\effects
@@ -3967,8 +3982,11 @@
39673982

39683983
\pnum
39693984
\expects
3970-
The \tcode{failure} argument is neither \tcode{memory_order::release} nor
3971-
\tcode{memory_order::acq_rel}.
3985+
\tcode{failure} is
3986+
\tcode{memory_order::relaxed},
3987+
\tcode{memory_order::consume},
3988+
\tcode{memory_order::ac\-quire}, or
3989+
\tcode{memory_order::seq_cst}.
39723990

39733991
\pnum
39743992
\effects
@@ -4119,7 +4137,11 @@
41194137
\begin{itemdescr}
41204138
\pnum
41214139
\expects
4122-
\tcode{order} is neither \tcode{memory_order::release} nor \tcode{memory_order::acq_rel}.
4140+
\tcode{order} is
4141+
\tcode{memory_order::relaxed},
4142+
\tcode{memory_order::consume},
4143+
\tcode{memory_order::ac-\linebreak quire}, or
4144+
\tcode{memory_order::seq_cst}.
41234145

41244146
\pnum
41254147
\effects
@@ -4970,10 +4992,10 @@
49704992
\begin{itemdescr}
49714993
\pnum
49724994
\expects
4973-
\tcode{order} is neither
4974-
\tcode{memory_order::consume},
4975-
\tcode{memory_order::acquire}, nor
4976-
\tcode{memory_order::acq_rel}.
4995+
\tcode{order} is
4996+
\tcode{memory_order::relaxed},
4997+
\tcode{memory_order::release}, or
4998+
\tcode{memory_order::seq_cst}.
49774999

49785000
\pnum
49795001
\effects
@@ -5012,8 +5034,11 @@
50125034
\begin{itemdescr}
50135035
\pnum
50145036
\expects
5015-
\tcode{order} is neither
5016-
\tcode{memory_order::release} nor \tcode{memory_order::acq_rel}.
5037+
\tcode{order} is
5038+
\tcode{memory_order::relaxed},
5039+
\tcode{memory_order::consume},
5040+
\tcode{memory_order::ac-\linebreak quire}, or
5041+
\tcode{memory_order::seq_cst}.
50175042

50185043
\pnum
50195044
\effects
@@ -5065,8 +5090,11 @@
50655090
\begin{itemdescr}
50665091
\pnum
50675092
\expects
5068-
\tcode{failure} is neither
5069-
\tcode{memory_order::release} nor \tcode{memory_order::acq_rel}.
5093+
\tcode{failure} is
5094+
\tcode{memory_order::relaxed},
5095+
\tcode{memory_order::consume},
5096+
\tcode{memory_order::ac\-quire}, or
5097+
\tcode{memory_order::seq_cst}.
50705098

50715099
\pnum
50725100
\effects
@@ -5151,7 +5179,10 @@
51515179
\pnum
51525180
\expects
51535181
\tcode{order} is
5154-
neither \tcode{memory_order::release} nor \tcode{memory_order::acq_rel}.
5182+
\tcode{memory_order::relaxed},
5183+
\tcode{memory_order::consume},
5184+
\tcode{memory_order::ac-\linebreak quire}, or
5185+
\tcode{memory_order::seq_cst}.
51555186

51565187
\pnum
51575188
\effects
@@ -5289,10 +5320,10 @@
52895320
\begin{itemdescr}
52905321
\pnum
52915322
\expects
5292-
\tcode{order} is neither
5293-
\tcode{memory_order::consume},
5294-
\tcode{memory_order::acquire}, nor
5295-
\tcode{memory_order::acq_rel}.
5323+
\tcode{order} is
5324+
\tcode{memory_order::relaxed},
5325+
\tcode{memory_order::release}, or
5326+
\tcode{memory_order::seq_cst}.
52965327

52975328
\pnum
52985329
\effects
@@ -5320,8 +5351,11 @@
53205351
\begin{itemdescr}
53215352
\pnum
53225353
\expects
5323-
\tcode{order} is neither
5324-
\tcode{memory_order::release} nor \tcode{memory_order::acq_rel}.
5354+
\tcode{order} is
5355+
\tcode{memory_order::relaxed},
5356+
\tcode{memory_order::consume},
5357+
\tcode{memory_order::ac-\linebreak quire}, or
5358+
\tcode{memory_order::seq_cst}.
53255359

53265360
\pnum
53275361
\effects
@@ -5372,8 +5406,11 @@
53725406
\begin{itemdescr}
53735407
\pnum
53745408
\expects
5375-
\tcode{failure} is neither
5376-
\tcode{memory_order::release} nor \tcode{memory_order::acq_rel}.
5409+
\tcode{failure} is
5410+
\tcode{memory_order::relaxed},
5411+
\tcode{memory_order::consume},
5412+
\tcode{memory_order::ac\-quire}, or
5413+
\tcode{memory_order::seq_cst}.
53775414

53785415
\pnum
53795416
\effects
@@ -5458,7 +5495,10 @@
54585495
\pnum
54595496
\expects
54605497
\tcode{order} is
5461-
neither \tcode{memory_order::release} nor \tcode{memory_order::acq_rel}.
5498+
\tcode{memory_order::relaxed},
5499+
\tcode{memory_order::consume},
5500+
\tcode{memory_order::ac-\linebreak quire}, or
5501+
\tcode{memory_order::seq_cst}.
54625502

54635503
\pnum
54645504
\effects
@@ -5603,7 +5643,10 @@
56035643
\pnum
56045644
\expects
56055645
\tcode{order} is
5606-
neither \tcode{memory_order::release} nor \tcode{memory_order::acq_rel}.
5646+
\tcode{memory_order::relaxed},
5647+
\tcode{memory_order::consume},
5648+
\tcode{memory_order::ac-\linebreak quire}, or
5649+
\tcode{memory_order::seq_cst}.
56075650

56085651
\pnum
56095652
\effects
@@ -5652,8 +5695,10 @@
56525695
\begin{itemdescr}
56535696
\pnum
56545697
\expects
5655-
The \tcode{order} argument is neither \tcode{memory_order::consume},
5656-
\tcode{memory_order::acquire}, nor \tcode{memory_order::acq_rel}.
5698+
\tcode{order} is
5699+
\tcode{memory_order::relaxed},
5700+
\tcode{memory_order::release}, or
5701+
\tcode{memory_order::seq_cst}.
56575702

56585703
\pnum
56595704
\effects
@@ -5687,7 +5732,10 @@
56875732
\pnum
56885733
\expects
56895734
\tcode{order} is
5690-
neither \tcode{memory_order::release} nor \tcode{memory_order::acq_rel}.
5735+
\tcode{memory_order::relaxed},
5736+
\tcode{memory_order::consume},
5737+
\tcode{memory_order::ac-\linebreak quire}, or
5738+
\tcode{memory_order::seq_cst}.
56915739

56925740
\pnum
56935741
\effects

0 commit comments

Comments
 (0)