Skip to content

Commit 3979c5b

Browse files
author
cpprefjp-autoupdate
committed
update automatically
1 parent c8b6b58 commit 3979c5b

File tree

264 files changed

+685
-964
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

264 files changed

+685
-964
lines changed

article/lib/at_thread_exit.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,9 @@ <h1 itemprop="name"><span class="token">_at_thread_exit系の関数が存在し
246246
<span class="k">template</span><span class="o">&lt;</span><span class="k">class</span> <span class="nc">F</span><span class="o">&gt;</span>
247247
<span class="n">std</span><span class="o">::</span><span class="n">future</span><span class="o">&lt;</span><span class="k">typename</span> <span class="n">std</span><span class="o">::</span><span class="n">result_of</span><span class="o">&lt;</span><span class="n">F</span><span class="p">()</span><span class="o">&gt;::</span><span class="n">type</span><span class="o">&gt;</span> <span class="n">spawn_task</span><span class="p">(</span><span class="n">F</span> <span class="n">f</span><span class="p">)</span> <span class="p">{</span>
248248
<span class="k">using</span> <span class="n">result_type</span> <span class="o">=</span> <span class="k">typename</span> <span class="n">std</span><span class="o">::</span><span class="n">result_of</span><span class="o">&lt;</span><span class="n">F</span><span class="p">()</span><span class="o">&gt;::</span><span class="n">type</span><span class="p">;</span>
249-
<span class="n">std</span><span class="o">::</span><span class="n">packaged_task</span><span class="o">&lt;</span><span class="n">result_type</span> <span class="p">()</span><span class="o">&gt;</span> <span class="n">task</span><span class="p">(</span><span class="n">std</span><span class="o">::</span><span class="n">move</span><span class="p">(</span><span class="n">f</span><span class="p">));</span>
249+
<span class="n">std</span><span class="o">::</span><span class="n">packaged_task</span><span class="o">&lt;</span><span class="n">result_type</span> <span class="p">()</span><span class="o">&gt;</span> <span class="n">task</span><span class="p">(</span><span class="n"><a href="../../reference/algorithm/move.html">std::move</a></span><span class="p">(</span><span class="n">f</span><span class="p">));</span>
250250
<span class="n">std</span><span class="o">::</span><span class="n">future</span><span class="o">&lt;</span><span class="n">result_type</span><span class="o">&gt;</span> <span class="n">future</span><span class="p">(</span><span class="n">task</span><span class="p">.</span><span class="n">get_future</span><span class="p">());</span>
251-
<span class="n"><a href="../../reference/thread/thread.html">std::thread</a></span> <span class="nf">th</span><span class="p">(</span><span class="n">std</span><span class="o">::</span><span class="n">move</span><span class="p">(</span><span class="n">task</span><span class="p">));</span>
251+
<span class="n"><a href="../../reference/thread/thread.html">std::thread</a></span> <span class="nf">th</span><span class="p">(</span><span class="n"><a href="../../reference/algorithm/move.html">std::move</a></span><span class="p">(</span><span class="n">task</span><span class="p">));</span>
252252
<span class="n">th</span><span class="p">.</span><span class="n">detach</span><span class="p">();</span>
253253
<span class="k">return</span> <span class="n">future</span><span class="p">;</span>
254254
<span class="p">}</span>
@@ -293,9 +293,9 @@ <h1 itemprop="name"><span class="token">_at_thread_exit系の関数が存在し
293293
<span class="k">template</span><span class="o">&lt;</span><span class="k">class</span> <span class="nc">F</span><span class="o">&gt;</span>
294294
<span class="n">std</span><span class="o">::</span><span class="n">future</span><span class="o">&lt;</span><span class="k">typename</span> <span class="n">std</span><span class="o">::</span><span class="n">result_of</span><span class="o">&lt;</span><span class="n">F</span><span class="p">()</span><span class="o">&gt;::</span><span class="n">type</span><span class="o">&gt;</span> <span class="n">spawn_task</span><span class="p">(</span><span class="n">F</span> <span class="n">f</span><span class="p">)</span> <span class="p">{</span>
295295
<span class="k">using</span> <span class="n">result_type</span> <span class="o">=</span> <span class="k">typename</span> <span class="n">std</span><span class="o">::</span><span class="n">result_of</span><span class="o">&lt;</span><span class="n">F</span><span class="p">()</span><span class="o">&gt;::</span><span class="n">type</span><span class="p">;</span>
296-
<span class="n">std</span><span class="o">::</span><span class="n">packaged_task</span><span class="o">&lt;</span><span class="n">result_type</span> <span class="p">()</span><span class="o">&gt;</span> <span class="n">task</span><span class="p">(</span><span class="n">std</span><span class="o">::</span><span class="n">move</span><span class="p">(</span><span class="n">f</span><span class="p">));</span>
296+
<span class="n">std</span><span class="o">::</span><span class="n">packaged_task</span><span class="o">&lt;</span><span class="n">result_type</span> <span class="p">()</span><span class="o">&gt;</span> <span class="n">task</span><span class="p">(</span><span class="n"><a href="../../reference/algorithm/move.html">std::move</a></span><span class="p">(</span><span class="n">f</span><span class="p">));</span>
297297
<span class="n">std</span><span class="o">::</span><span class="n">future</span><span class="o">&lt;</span><span class="n">result_type</span><span class="o">&gt;</span> <span class="n">future</span><span class="p">(</span><span class="n">task</span><span class="p">.</span><span class="n">get_future</span><span class="p">());</span>
298-
<span class="n"><a href="../../reference/thread/thread.html">std::thread</a></span> <span class="nf">th</span><span class="p">(</span><span class="n">task_executor</span><span class="p">{},</span> <span class="n">std</span><span class="o">::</span><span class="n">move</span><span class="p">(</span><span class="n">task</span><span class="p">));</span>
298+
<span class="n"><a href="../../reference/thread/thread.html">std::thread</a></span> <span class="nf">th</span><span class="p">(</span><span class="n">task_executor</span><span class="p">{},</span> <span class="n"><a href="../../reference/algorithm/move.html">std::move</a></span><span class="p">(</span><span class="n">task</span><span class="p">));</span>
299299
<span class="n">th</span><span class="p">.</span><span class="n">detach</span><span class="p">();</span>
300300
<span class="k">return</span> <span class="n">future</span><span class="p">;</span>
301301
<span class="p">}</span>

article/lib/how_to_use_cv.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ <h2>ミューテックスと複数の条件変数</h2>
337337
<span class="n">not_full_</span><span class="p">.</span><span class="n">wait</span><span class="p">(</span><span class="n">lk</span><span class="p">,</span> <span class="p">[</span><span class="k">this</span><span class="p">]{</span>
338338
<span class="k">return</span> <span class="n">queue_</span><span class="p">.</span><span class="n">size</span><span class="p">()</span> <span class="o">&lt;</span> <span class="n">N</span><span class="p">;</span>
339339
<span class="p">});</span>
340-
<span class="n">queue_</span><span class="p">.</span><span class="n">push</span><span class="p">(</span><span class="n">std</span><span class="o">::</span><span class="n">move</span><span class="p">(</span><span class="n">val</span><span class="p">));</span>
340+
<span class="n">queue_</span><span class="p">.</span><span class="n">push</span><span class="p">(</span><span class="n"><a href="../../reference/algorithm/move.html">std::move</a></span><span class="p">(</span><span class="n">val</span><span class="p">));</span>
341341
<span class="n">not_empty_</span><span class="p">.</span><span class="n">notify_all</span><span class="p">();</span>
342342
<span class="p">}</span>
343343
<span class="c1">// 値の取り出し</span>
@@ -346,7 +346,7 @@ <h2>ミューテックスと複数の条件変数</h2>
346346
<span class="n">not_empty_</span><span class="p">.</span><span class="n">wait</span><span class="p">(</span><span class="n">lk</span><span class="p">,</span> <span class="p">[</span><span class="k">this</span><span class="p">]{</span>
347347
<span class="k">return</span> <span class="o">!</span><span class="n">queue_</span><span class="p">.</span><span class="n">empty</span><span class="p">();</span>
348348
<span class="p">});</span>
349-
<span class="n">T</span> <span class="n">ret</span> <span class="o">=</span> <span class="n">std</span><span class="o">::</span><span class="n">move</span><span class="p">(</span><span class="n">queue_</span><span class="p">.</span><span class="n">front</span><span class="p">());</span>
349+
<span class="n">T</span> <span class="n">ret</span> <span class="o">=</span> <span class="n"><a href="../../reference/algorithm/move.html">std::move</a></span><span class="p">(</span><span class="n">queue_</span><span class="p">.</span><span class="n">front</span><span class="p">());</span>
350350
<span class="n">queue_</span><span class="p">.</span><span class="n">pop</span><span class="p">();</span>
351351
<span class="n">not_full_</span><span class="p">.</span><span class="n">notify_all</span><span class="p">();</span>
352352
<span class="k">return</span> <span class="n">ret</span><span class="p">;</span>

lang/cpp11/range_based_for.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ <h3>for-range-initializerに渡したものの寿命が切れてしまう場合<
506506
<span class="n">something</span><span class="p">(</span><span class="k">const</span> <span class="n"><a href="../../reference/initializer_list/initializer_list.html">std::initializer_list</a></span><span class="o">&lt;</span><span class="kt">int</span><span class="o">&gt;&amp;</span> <span class="n">l</span> <span class="p">)</span> <span class="o">:</span> <span class="n">v</span><span class="p">(</span><span class="n">l</span><span class="p">)</span> <span class="p">{}</span>
507507
<span class="n"><a href="../../reference/vector/vector.html">std::vector</a></span><span class="o">&lt;</span><span class="kt">int</span><span class="o">&gt;&amp;</span> <span class="n">get_vector</span><span class="p">()</span> <span class="o">&amp;</span> <span class="p">{</span> <span class="k">return</span> <span class="n">v</span><span class="p">;</span> <span class="p">}</span>
508508
<span class="c1">// これを実装すれば実行効率を損なわず、安全にいつでもget_vectorを呼び出せる</span>
509-
<span class="c1">//<a href="../../reference/vector/vector.html">std::vector</a>&lt;int&gt; get_vector() &amp;&amp; { return std::move(v); }</span>
509+
<span class="c1">//<a href="../../reference/vector/vector.html">std::vector</a>&lt;int&gt; get_vector() &amp;&amp; { return <a href="../../reference/algorithm/move.html">std::move</a>(v); }</span>
510510
<span class="o">~</span><span class="n">something</span><span class="p">()</span> <span class="k">noexcept</span> <span class="p">{</span> <span class="n"><a href="../../reference/iostream/cout.html">std::cout</a></span> <span class="o">&lt;&lt;</span> <span class="s">"destructor"</span> <span class="o">&lt;&lt;</span> <span class="n"><a href="../../reference/ostream/endl.html">std::endl</a></span><span class="p">;</span> <span class="p">}</span>
511511
<span class="p">};</span>
512512

lang/cpp20/allow_initializing_aggregates_from_a_parenthesized_list_of_values.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ <h2>仕様</h2>
254254
<span class="n">A</span> <span class="nf">a2</span><span class="p">(</span><span class="mi">1</span><span class="p">,</span> <span class="n">f</span><span class="p">());</span> <span class="c1">// well-formedだがダングリング参照</span>
255255
<span class="n">A</span> <span class="n">a3</span><span class="p">{</span><span class="mf">1.0</span><span class="p">,</span> <span class="mi">1</span><span class="p">};</span> <span class="c1">// エラー: 縮小変換はできない</span>
256256
<span class="n">A</span> <span class="nf">a4</span><span class="p">(</span><span class="mf">1.0</span><span class="p">,</span> <span class="mi">1</span><span class="p">);</span> <span class="c1">// well-formedだがダングリング参照</span>
257-
<span class="n">A</span> <span class="nf">a5</span><span class="p">(</span><span class="mf">1.0</span><span class="p">,</span> <span class="n">std</span><span class="o">::</span><span class="n">move</span><span class="p">(</span><span class="n">n</span><span class="p">));</span> <span class="c1">// OK</span>
257+
<span class="n">A</span> <span class="nf">a5</span><span class="p">(</span><span class="mf">1.0</span><span class="p">,</span> <span class="n"><a href="../../reference/algorithm/move.html">std::move</a></span><span class="p">(</span><span class="n">n</span><span class="p">));</span> <span class="c1">// OK</span>
258258
</code></pre></div>
259259
</p>
260260
<h2></h2>

lang/cpp20/allow_pack_expansion_in_lambda_init_capture.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ <h2>概要</h2>
222222
<p>例えば、関数パラメーターパックをムーブしてキャプチャしようとする際には、次のように書くことができる。</p>
223223
<p><div class="codehilite"><pre><span></span><code><span class="k">template</span> <span class="o">&lt;</span><span class="n">class</span><span class="p">...</span> <span class="n">Args</span><span class="o">&gt;</span>
224224
<span class="k">auto</span> <span class="n">f</span><span class="p">(</span><span class="n">Args</span><span class="p">...</span> <span class="n">args</span><span class="p">)</span> <span class="p">{</span>
225-
<span class="p">[...</span><span class="n">args</span><span class="o">=</span><span class="n">std</span><span class="o">::</span><span class="n">move</span><span class="p">(</span><span class="n">args</span><span class="p">)]</span> <span class="p">{</span> <span class="c1">// 初期化キャプチャでのパック展開</span>
225+
<span class="p">[...</span><span class="n">args</span><span class="o">=</span><span class="n"><a href="../../reference/algorithm/move.html">std::move</a></span><span class="p">(</span><span class="n">args</span><span class="p">)]</span> <span class="p">{</span> <span class="c1">// 初期化キャプチャでのパック展開</span>
226226

227227
<span class="n">g</span><span class="p">(</span><span class="n">args</span><span class="p">...);</span> <span class="c1">// ラムダ式内で、パックを使う例</span>
228228

@@ -264,7 +264,7 @@ <h2>例</h2>
264264

265265
<span class="k">template</span> <span class="o">&lt;</span><span class="n">class</span><span class="p">...</span> <span class="n">Args</span><span class="o">&gt;</span>
266266
<span class="k">auto</span> <span class="n">f</span><span class="p">(</span><span class="n">Args</span><span class="p">...</span> <span class="n">args</span><span class="p">)</span> <span class="p">{</span>
267-
<span class="k">return</span> <span class="p">[...</span><span class="n">args</span><span class="o">=</span><span class="n">std</span><span class="o">::</span><span class="n">move</span><span class="p">(</span><span class="n">args</span><span class="p">)]</span> <span class="p">{</span> <span class="c1">// 初期化キャプチャでのパック展開</span>
267+
<span class="k">return</span> <span class="p">[...</span><span class="n">args</span><span class="o">=</span><span class="n"><a href="../../reference/algorithm/move.html">std::move</a></span><span class="p">(</span><span class="n">args</span><span class="p">)]</span> <span class="p">{</span> <span class="c1">// 初期化キャプチャでのパック展開</span>
268268

269269
<span class="n">g</span><span class="p">(</span><span class="n">args</span><span class="p">...);</span> <span class="c1">// ラムダ式内で、init-capture パック(args)を使う例</span>
270270

@@ -295,7 +295,7 @@ <h2>この機能が必要になった背景・経緯</h2>
295295
<p>例えば、上記の例にある関数 <code>f</code> は、C++17 以前では次のように書く必要がある。</p>
296296
<p><div class="codehilite"><pre><span></span><code><span class="k">template</span> <span class="o">&lt;</span><span class="n">class</span><span class="p">...</span> <span class="n">Args</span><span class="o">&gt;</span>
297297
<span class="k">auto</span> <span class="n">f</span><span class="p">(</span><span class="n">Args</span><span class="p">...</span> <span class="n">args</span><span class="p">)</span> <span class="p">{</span>
298-
<span class="p">[</span><span class="n">tup</span><span class="o">=</span><span class="n">std</span><span class="o">::</span><span class="n">make_tuple</span><span class="p">(</span><span class="n">std</span><span class="o">::</span><span class="n">move</span><span class="p">(</span><span class="n">args</span><span class="p">)...)]</span> <span class="p">{</span>
298+
<span class="p">[</span><span class="n">tup</span><span class="o">=</span><span class="n">std</span><span class="o">::</span><span class="n">make_tuple</span><span class="p">(</span><span class="n"><a href="../../reference/algorithm/move.html">std::move</a></span><span class="p">(</span><span class="n">args</span><span class="p">)...)]</span> <span class="p">{</span>
299299
<span class="n">std</span><span class="o">::</span><span class="n">apply</span><span class="p">([](</span><span class="k">auto</span> <span class="k">const</span><span class="o">&amp;</span><span class="p">...</span> <span class="n">args</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="n"><a href="../cpp14/decltype_auto.html">decltype(auto)</a></span> <span class="p">{</span>
300300
<span class="k">return</span> <span class="n">g</span><span class="p">(</span><span class="n">args</span><span class="p">...);</span>
301301
<span class="p">},</span> <span class="n">tup</span><span class="p">);</span>
@@ -316,7 +316,7 @@ <h2>検討されたほかの選択肢</h2>
316316
<p>P0780R2 のひとつ前のリビジョンである <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0780r1.html" target="_blank">P0780R1</a> では、 <code>...</code> 記号の位置が、</p>
317317
<p><div class="codehilite"><pre><span></span><code><span class="k">template</span> <span class="o">&lt;</span><span class="n">class</span><span class="p">...</span> <span class="n">Args</span><span class="o">&gt;</span>
318318
<span class="k">auto</span> <span class="n">f</span><span class="p">(</span><span class="n">Args</span><span class="p">...</span> <span class="n">args</span><span class="p">)</span> <span class="p">{</span>
319-
<span class="p">[</span><span class="n">args</span><span class="o">=</span><span class="n">std</span><span class="o">::</span><span class="n">move</span><span class="p">(</span><span class="n">args</span><span class="p">)...]</span> <span class="p">{</span>
319+
<span class="p">[</span><span class="n">args</span><span class="o">=</span><span class="n"><a href="../../reference/algorithm/move.html">std::move</a></span><span class="p">(</span><span class="n">args</span><span class="p">)...]</span> <span class="p">{</span>
320320
<span class="n">g</span><span class="p">(</span><span class="n">args</span><span class="p">...);</span>
321321
<span class="p">};</span>
322322
<span class="p">}</span>

0 commit comments

Comments
 (0)