Skip to content

Commit 072dfc6

Browse files
jensmaurertkoeppe
authored andcommitted
[execpol] Merge existing <execution> header synopsis into [exec]
1 parent 516db77 commit 072dfc6

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
@@ -15224,6 +15224,7 @@
1522415224
object of an execution policy type indicates the kinds of parallelism allowed
1522515225
in the execution of an algorithm and expresses the consequent requirements on
1522615226
the element access functions.
15227+
Execution policy types are declared in header \libheaderref{execution}.
1522715228
\begin{example}
1522815229
\begin{codeblock}
1522915230
using namespace std;
@@ -15249,37 +15250,6 @@
1524915250
parameters for efficient execution.
1525015251
\end{note}
1525115252

15252-
\rSec2[execution.syn]{Header \tcode{<execution>} synopsis}
15253-
15254-
\indexheader{execution}%
15255-
\begin{codeblock}
15256-
namespace std {
15257-
// \ref{execpol.type}, execution policy type trait
15258-
template<class T> struct is_execution_policy;
15259-
template<class T> constexpr bool @\libglobal{is_execution_policy_v}@ = is_execution_policy<T>::value;
15260-
}
15261-
15262-
namespace std::execution {
15263-
// \ref{execpol.seq}, sequenced execution policy
15264-
class sequenced_policy;
15265-
15266-
// \ref{execpol.par}, parallel execution policy
15267-
class parallel_policy;
15268-
15269-
// \ref{execpol.parunseq}, parallel and unsequenced execution policy
15270-
class parallel_unsequenced_policy;
15271-
15272-
// \ref{execpol.unseq}, unsequenced execution policy
15273-
class unsequenced_policy;
15274-
15275-
// \ref{execpol.objects}, execution policy objects
15276-
inline constexpr sequenced_policy seq{ @\unspec@ };
15277-
inline constexpr parallel_policy par{ @\unspec@ };
15278-
inline constexpr parallel_unsequenced_policy par_unseq{ @\unspec@ };
15279-
inline constexpr unsequenced_policy unseq{ @\unspec@ };
15280-
}
15281-
\end{codeblock}
15282-
1528315253
\rSec2[execpol.type]{Execution policy type trait}
1528415254

1528515255
\indexlibraryglobal{is_execution_policy}%
@@ -15409,7 +15379,7 @@
1540915379

1541015380
\begin{itemdescr}
1541115381
\pnum
15412-
The header \libheader{execution} declares global objects associated with each type of execution policy.
15382+
The header \libheaderref{execution} declares global objects associated with each type of execution policy.
1541315383
\end{itemdescr}
1541415384

1541515385
\rSec1[charconv]{Primitive numeric conversions}

0 commit comments

Comments
 (0)