Skip to content

Commit 795ecfe

Browse files
committed
[basic.start.dynamic] Convert long conditional sentence to bulleted form.
1 parent accb1d8 commit 795ecfe

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

source/basic.tex

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2630,11 +2630,20 @@
26302630
\item
26312631
If \tcode{V} has partially-ordered initialization, \tcode{W} does not have
26322632
unordered initialization, and \tcode{V} is defined before \tcode{W} in
2633-
every translation unit in which \tcode{W} is defined, the initialization of
2634-
\tcode{V} is sequenced before the initialization of \tcode{W} if the
2635-
program does not start a thread~(\ref{intro.multithread})
2636-
other than the main thread~(\ref{basic.start.main})
2637-
and otherwise strongly happens before the initialization of \tcode{W}.
2633+
every translation unit in which \tcode{W} is defined, then
2634+
\begin{itemize}
2635+
\item
2636+
if the program starts a thread~(\ref{intro.multithread})
2637+
other than the main thread~(\ref{basic.start.main}),
2638+
the initialization of \tcode{V}
2639+
strongly happens before
2640+
the initialization of \tcode{W};
2641+
\item
2642+
otherwise,
2643+
the initialization of \tcode{V}
2644+
is sequenced before
2645+
the initialization of \tcode{W}.
2646+
\end{itemize}
26382647

26392648
\item
26402649
Otherwise, if the program starts a thread
@@ -2670,7 +2679,7 @@
26702679
defined in the same translation unit as the variable to be initialized.%
26712680
\footnote{A non-local variable with static storage duration
26722681
having initialization
2673-
with side effects is initialized in this case
2682+
with side effects is initialized in this case,
26742683
even if it is not itself odr-used (\ref{basic.def.odr},~\ref{basic.stc.static}).}
26752684
It is \impldef{threads and program points at which deferred dynamic initialization is performed}
26762685
in which threads and at which points in the program such deferred dynamic initialization occurs.

source/intro.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1336,7 +1336,7 @@
13361336
\item \placeholder{A} strongly happens before \placeholder{X} and \placeholder{X} strongly happens before \placeholder{B}.
13371337
\end{itemize}
13381338
\begin{note}
1339-
In the absence of consume operations
1339+
In the absence of consume operations,
13401340
the happens before and strongly happens before relations are identical.
13411341
Strongly happens before essentially excludes consume operations.
13421342
\end{note}

0 commit comments

Comments
 (0)