Skip to content

Commit 186b74e

Browse files
committed
Use standard wording for SFINAE requirements for which is_execution_policy is involved.
These paragraphs become Remarks instead of Requires paragraphs. Fixes n3554/n3554#52
1 parent 403497c commit 186b74e

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

algorithms.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ <h1><code>ExecutionPolicy</code> algorithm overloads</h1>
158158
</p>
159159

160160
<p>
161-
Parallel algorithms have the requirement <code>is_execution_policy&lt;ExecutionPolicy&gt;::value</code>
162-
is <code>true</code>.
161+
Parallel algorithms shall not participate in overload resolution unless
162+
<code>is_execution_policy&lt;ExecutionPolicy&gt;::value</code> is <code>true</code>.
163163
</p>
164164

165165
<p>The algorithms listed in <cxx-ref to="tab.parallel.algorithms"></cxx-ref> shall have <code>ExecutionPolicy</code> overloads.</p>

execution_policies.html

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,10 @@ <h1><code>execution_policy</code> construct/assign</h1>
193193

194194
<cxx-effects>Constructs an <code>execution_policy</code> object with a copy of <code>exec</code>'s state.</cxx-effects>
195195

196-
<cxx-requires><code>is_execution_policy&lt;T&gt;::value</code> is <code>true</code>.</cxx-requires>
196+
<cxx-remarks>
197+
This constructor shall not participate in overload resolution unless
198+
<code>is_execution_policy&lt;T&gt;::value</code> is <code>true</code>.
199+
</cxx-remarks>
197200
</cxx-function>
198201

199202
<cxx-function>
@@ -203,7 +206,10 @@ <h1><code>execution_policy</code> construct/assign</h1>
203206

204207
<cxx-returns><code>*this</code>.
205208

206-
<cxx-requires><code>is_execution_policy&lt;T&gt;::value</code> is <code>true</code>.</cxx-requires>
209+
<cxx-remarks>
210+
This operator shall not partipate in overload resolution uless
211+
<code>is_execution_policy&lt;T&gt;::value</code> is <code>true</code>.
212+
</cxx-remarks>
207213
</cxx-function>
208214
</cxx-section>
209215

@@ -226,7 +232,10 @@ <h1><code>execution_policy</code> object access</h1>
226232

227233
<cxx-returns>If <code>target_type() == typeid(T)</code>, a pointer to the stored execution policy object; otherwise a null pointer.</cxx-returns>
228234

229-
<cxx-requires><code>is_execution_policy&lt;T&gt;</code> is <code>true</code>.</cxx-requires>
235+
<cxx-remarks>
236+
This function shall not participate in overload resolution unless
237+
<code>is_execution_policy&lt;T&gt;</code> is <code>true</code>.
238+
</cxx-remarks>
230239
</cxx-function>
231240

232241
</cxx-section>

0 commit comments

Comments
 (0)