Skip to content

Commit 94a62b7

Browse files
committed
[execpol] Merge existing <execution> header synopsis into [exec]
1 parent 7a7b43c commit 94a62b7

File tree

2 files changed

+30
-33
lines changed

2 files changed

+30
-33
lines changed

source/exec.tex

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,9 +388,36 @@
388388
whose return type is not the type of a sender.
389389
\end{itemize}
390390

391-
\rSec1[exec.syn]{Header \tcode{<execution>} synopsis}
391+
\rSec1[execution.syn]{Header \tcode{<execution>} synopsis}
392392

393+
\indexheader{execution}%
393394
\begin{codeblock}
395+
namespace std {
396+
// \ref{execpol.type}, execution policy type trait
397+
template<class T> struct is_execution_policy;
398+
template<class T> constexpr bool @\libglobal{is_execution_policy_v}@ = is_execution_policy<T>::value;
399+
}
400+
401+
namespace std::execution {
402+
// \ref{execpol.seq}, sequenced execution policy
403+
class sequenced_policy;
404+
405+
// \ref{execpol.par}, parallel execution policy
406+
class parallel_policy;
407+
408+
// \ref{execpol.parunseq}, parallel and unsequenced execution policy
409+
class parallel_unsequenced_policy;
410+
411+
// \ref{execpol.unseq}, unsequenced execution policy
412+
class unsequenced_policy;
413+
414+
// \ref{execpol.objects}, execution policy objects
415+
inline constexpr sequenced_policy seq{ @\unspec@ };
416+
inline constexpr parallel_policy par{ @\unspec@ };
417+
inline constexpr parallel_unsequenced_policy par_unseq{ @\unspec@ };
418+
inline constexpr unsequenced_policy unseq{ @\unspec@ };
419+
}
420+
394421
namespace std {
395422
// \ref{exec.general}, helper concepts
396423
template<class T>

source/utilities.tex

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -15214,6 +15214,7 @@
1521415214
object of an execution policy type indicates the kinds of parallelism allowed
1521515215
in the execution of an algorithm and expresses the consequent requirements on
1521615216
the element access functions.
15217+
Execution policy types are declared in header \libheaderref{execution}.
1521715218
\begin{example}
1521815219
\begin{codeblock}
1521915220
using namespace std;
@@ -15239,37 +15240,6 @@
1523915240
parameters for efficient execution.
1524015241
\end{note}
1524115242

15242-
\rSec2[execution.syn]{Header \tcode{<execution>} synopsis}
15243-
15244-
\indexheader{execution}%
15245-
\begin{codeblock}
15246-
namespace std {
15247-
// \ref{execpol.type}, execution policy type trait
15248-
template<class T> struct is_execution_policy;
15249-
template<class T> constexpr bool @\libglobal{is_execution_policy_v}@ = is_execution_policy<T>::value;
15250-
}
15251-
15252-
namespace std::execution {
15253-
// \ref{execpol.seq}, sequenced execution policy
15254-
class sequenced_policy;
15255-
15256-
// \ref{execpol.par}, parallel execution policy
15257-
class parallel_policy;
15258-
15259-
// \ref{execpol.parunseq}, parallel and unsequenced execution policy
15260-
class parallel_unsequenced_policy;
15261-
15262-
// \ref{execpol.unseq}, unsequenced execution policy
15263-
class unsequenced_policy;
15264-
15265-
// \ref{execpol.objects}, execution policy objects
15266-
inline constexpr sequenced_policy seq{ @\unspec@ };
15267-
inline constexpr parallel_policy par{ @\unspec@ };
15268-
inline constexpr parallel_unsequenced_policy par_unseq{ @\unspec@ };
15269-
inline constexpr unsequenced_policy unseq{ @\unspec@ };
15270-
}
15271-
\end{codeblock}
15272-
1527315243
\rSec2[execpol.type]{Execution policy type trait}
1527415244

1527515245
\indexlibraryglobal{is_execution_policy}%
@@ -15399,7 +15369,7 @@
1539915369

1540015370
\begin{itemdescr}
1540115371
\pnum
15402-
The header \libheader{execution} declares global objects associated with each type of execution policy.
15372+
The header \libheaderref{execution} declares global objects associated with each type of execution policy.
1540315373
\end{itemdescr}
1540415374

1540515375
\rSec1[charconv]{Primitive numeric conversions}

0 commit comments

Comments
 (0)