Skip to content

Commit 904d67b

Browse files
author
cpprefjp-autoupdate
committed
update automatically
1 parent a9f775f commit 904d67b

21 files changed

+2428
-787
lines changed

reference/chrono/make24.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ <h2>例</h2>
239239
<span class="n"><a href="../cassert/assert.html">assert</a></span><span class="p">(</span><span class="n"><span style="color:#ff0000">chrono::make24</span></span><span class="p">(</span><span class="n"><a href="duration/op_h.html">12h</a></span><span class="p">,</span> <span class="nb">false</span><span class="p">)</span> <span class="o">==</span> <span class="n"><a href="duration/op_h.html">0h</a></span><span class="p">);</span>
240240

241241
<span class="n"><a href="../cassert/assert.html">assert</a></span><span class="p">(</span><span class="n"><span style="color:#ff0000">chrono::make24</span></span><span class="p">(</span><span class="n"><a href="duration/op_h.html">12h</a></span><span class="p">,</span> <span class="nb">true</span><span class="p">)</span> <span class="o">==</span> <span class="n"><a href="duration/op_h.html">12h</a></span><span class="p">);</span>
242-
<span class="n"><a href="../cassert/assert.html">assert</a></span><span class="p">(</span><span class="n"><span style="color:#ff0000">chrono::make24</span></span><span class="p">(</span><span class="n"><a href="duration/op_h.html">1h</a></span><span class="p">,</span> <span class="nb">true</span><span class="p">)</span> <span class="o">==</span> <span class="mf">1F</span><span class="n">oRzUAuQcFAybDvewRiWzdnOWfnfwMOG</span><span class="p">);</span>
242+
<span class="n"><a href="../cassert/assert.html">assert</a></span><span class="p">(</span><span class="n"><span style="color:#ff0000">chrono::make24</span></span><span class="p">(</span><span class="n"><a href="duration/op_h.html">1h</a></span><span class="p">,</span> <span class="nb">true</span><span class="p">)</span> <span class="o">==</span> <span class="mi">1</span><span class="n"><a href="duration/op_h.html">3h</a></span><span class="p">);</span>
243243
<span class="n"><a href="../cassert/assert.html">assert</a></span><span class="p">(</span><span class="n"><span style="color:#ff0000">chrono::make24</span></span><span class="p">(</span><span class="n"><a href="duration/op_h.html">3h</a></span><span class="p">,</span> <span class="nb">true</span><span class="p">)</span> <span class="o">==</span> <span class="n"><a href="duration/op_h.html">15h</a></span><span class="p">);</span>
244244
<span class="n"><a href="../cassert/assert.html">assert</a></span><span class="p">(</span><span class="n"><span style="color:#ff0000">chrono::make24</span></span><span class="p">(</span><span class="n"><a href="duration/op_h.html">11h</a></span><span class="p">,</span> <span class="nb">true</span><span class="p">)</span> <span class="o">==</span> <span class="n"><a href="duration/op_h.html">23h</a></span><span class="p">);</span>
245245
<span class="p">}</span>

reference/iterator/common_iterator.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
<div itemprop="articleBody"><p><div class="codehilite"><pre><span></span><code><span class="k">namespace</span> <span class="n">std</span> <span class="p">{</span>
217217
<span class="k">template</span><span class="o">&lt;</span><span class="n"><a href="input_or_output_iterator.html">input_or_output_iterator</a></span> <span class="n">I</span><span class="p">,</span> <span class="n"><a href="sentinel_for.html">sentinel_for</a></span><span class="o">&lt;</span><span class="n">I</span><span class="o">&gt;</span> <span class="n">S</span><span class="o">&gt;</span>
218218
<span class="n">requires</span> <span class="p">(</span><span class="o">!</span><span class="n"><a href="../concepts/same_as.html">same_as</a></span><span class="o">&lt;</span><span class="n">I</span><span class="p">,</span> <span class="n">S</span><span class="o">&gt;</span> <span class="o">&amp;&amp;</span> <span class="n"><a href="../concepts/copyable.html">copyable</a></span><span class="o">&lt;</span><span class="n">I</span><span class="o">&gt;</span><span class="p">)</span>
219-
<span class="k">class</span> <span class="nc">common_iterator</span> <span class="p">{</span>
219+
<span class="k">class</span> <span class="nc"><a href="">common_iterator</a></span> <span class="p">{</span>
220220

221221
<span class="k">private</span><span class="o">:</span>
222222
<span class="n"><a href="../variant/variant.html">variant</a></span><span class="o">&lt;</span><span class="n">I</span><span class="p">,</span> <span class="n">S</span><span class="o">&gt;</span> <span class="n">v_</span><span class="p">;</span> <span class="c1">// 説明専用メンバ変数</span>
@@ -225,13 +225,13 @@
225225

226226
<span class="c1">// <a href="incrementable_traits.html">incrementable_traits</a>にアダプトする</span>
227227
<span class="k">template</span><span class="o">&lt;</span><span class="k">class</span> <span class="nc">I</span><span class="p">,</span> <span class="k">class</span> <span class="nc">S</span><span class="o">&gt;</span>
228-
<span class="k">struct</span> <span class="n"><a href="incrementable_traits.html">incrementable_traits</a></span><span class="o">&lt;</span><span class="n">common_iterator</span><span class="o">&lt;</span><span class="n">I</span><span class="p">,</span> <span class="n">S</span><span class="o">&gt;&gt;</span> <span class="p">{</span>
228+
<span class="k">struct</span> <span class="n"><a href="incrementable_traits.html">incrementable_traits</a></span><span class="o">&lt;</span><span class="n"><a href="">common_iterator</a></span><span class="o">&lt;</span><span class="n">I</span><span class="p">,</span> <span class="n">S</span><span class="o">&gt;&gt;</span> <span class="p">{</span>
229229
<span class="k">using</span> <span class="n">difference_type</span> <span class="o">=</span> <span class="n"><a href="iter_difference_t.html">iter_difference_t</a></span><span class="o">&lt;</span><span class="n">I</span><span class="o">&gt;</span><span class="p">;</span>
230230
<span class="p">};</span>
231231

232232
<span class="c1">// <a href="iterator_traits.html">iterator_traits</a>にアダプトする</span>
233233
<span class="k">template</span><span class="o">&lt;</span><span class="n"><a href="input_iterator.html">input_iterator</a></span> <span class="n">I</span><span class="p">,</span> <span class="k">class</span> <span class="nc">S</span><span class="o">&gt;</span>
234-
<span class="k">struct</span> <span class="n"><a href="iterator_traits.html">iterator_traits</a></span><span class="o">&lt;</span><span class="n">common_iterator</span><span class="o">&lt;</span><span class="n">I</span><span class="p">,</span> <span class="n">S</span><span class="o">&gt;&gt;</span> <span class="p">{</span>
234+
<span class="k">struct</span> <span class="n"><a href="iterator_traits.html">iterator_traits</a></span><span class="o">&lt;</span><span class="n"><a href="">common_iterator</a></span><span class="o">&lt;</span><span class="n">I</span><span class="p">,</span> <span class="n">S</span><span class="o">&gt;&gt;</span> <span class="p">{</span>
235235
<span class="k">using</span> <span class="n">iterator_concept</span> <span class="o">=</span> <span class="cm">/*<i>see below</i>*/</span><span class="p">;</span>
236236
<span class="k">using</span> <span class="n">iterator_category</span> <span class="o">=</span> <span class="cm">/*<i>see below</i>*/</span><span class="p">;</span> <span class="c1">// 定義されない場合がある</span>
237237
<span class="k">using</span> <span class="n">value_type</span> <span class="o">=</span> <span class="n"><a href="iter_value_t.html">iter_value_t</a></span><span class="o">&lt;</span><span class="n">I</span><span class="o">&gt;</span><span class="p">;</span>
@@ -384,7 +384,7 @@ <h2>例</h2>
384384
<span class="c1">// 範囲seqはイテレータ型と番兵型が異なっているためそのままだとエラー</span>
385385
<span class="c1">//iter_output(std::<a href="../ranges/begin.html">ranges::begin</a>(seq), std::<a href="../ranges/end.html">ranges::end</a>(seq));</span>
386386

387-
<span class="c1">// common_iteratorを通すことでイテレータ型と番兵型を合わせる</span>
387+
<span class="c1">// <a href="">common_iterator</a>を通すことでイテレータ型と番兵型を合わせる</span>
388388
<span class="k">using</span> <span class="n">CI</span> <span class="o">=</span> <span class="n"><span style="color:#ff0000">std::common_iterator</span></span><span class="o">&lt;</span><span class="n">std</span><span class="o">::</span><span class="n">ranges</span><span class="o">::</span><span class="n"><a href="../ranges/iterator_t.html">iterator_t</a></span><span class="o">&lt;</span><span class="k">decltype</span><span class="p">(</span><span class="n">seq</span><span class="p">)</span><span class="o">&gt;</span><span class="p">,</span> <span class="n">std</span><span class="o">::</span><span class="n">ranges</span><span class="o">::</span><span class="n"><a href="../ranges/sentinel_t.html">sentinel_t</a></span><span class="o">&lt;</span><span class="k">decltype</span><span class="p">(</span><span class="n">seq</span><span class="p">)</span><span class="o">&gt;&gt;</span><span class="p">;</span>
389389

390390
<span class="k">auto</span> <span class="n">it</span> <span class="o">=</span> <span class="n">CI</span><span class="p">{</span><span class="n">std</span><span class="o">::</span><span class="n"><a href="../ranges/begin.html">ranges::begin</a></span><span class="p">(</span><span class="n">seq</span><span class="p">)};</span>

reference/iterator/common_iterator/iter_move.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,9 @@
227227
<div class="identifier-type">function</div><div class="header">&lt;iterator&gt;</div><h1 itemprop="name"><span class="namespace" title="namespace std">std::</span><span class="class" title="class common_iterator">common_iterator::</span><span class="token">iter_move</span><span class="cpp cpp20" title="C++20で追加">(C++20)</span></h1>
228228
<div itemprop="articleBody"><p><div class="codehilite"><pre><span></span><code><span class="k">namespace</span> <span class="n">std</span> <span class="p">{</span>
229229
<span class="k">template</span><span class="o">&lt;</span><span class="n"><a href="../input_or_output_iterator.html">input_or_output_iterator</a></span> <span class="n">I</span><span class="p">,</span> <span class="n"><a href="../sentinel_for.html">sentinel_for</a></span><span class="o">&lt;</span><span class="n">I</span><span class="o">&gt;</span> <span class="n">S</span><span class="o">&gt;</span>
230-
<span class="k">class</span> <span class="nc">common_iterator</span> <span class="p">{</span>
230+
<span class="k">class</span> <span class="nc"><a href="../common_iterator.html">common_iterator</a></span> <span class="p">{</span>
231231

232-
<span class="k">friend</span> <span class="n"><a href="../../../lang/cpp14/decltype_auto.html">decltype(auto)</a></span> <span class="n">iter_move</span><span class="p">(</span><span class="k">const</span> <span class="n">common_iterator</span><span class="o">&amp;</span> <span class="n">i</span><span class="p">)</span>
232+
<span class="k">friend</span> <span class="n"><a href="../../../lang/cpp14/decltype_auto.html">decltype(auto)</a></span> <span class="n">iter_move</span><span class="p">(</span><span class="k">const</span> <span class="n"><a href="../common_iterator.html">common_iterator</a></span><span class="o">&amp;</span> <span class="n">i</span><span class="p">)</span>
233233
<span class="k">noexcept</span><span class="p">(</span><span class="k">noexcept</span><span class="p">(</span><span class="n"><a href="../iter_move.html">ranges::iter_move</a></span><span class="p">(</span><span class="n"><a href="../../utility/declval.html">declval</a></span><span class="o">&lt;</span><span class="k">const</span> <span class="n">I</span><span class="o">&amp;&gt;</span><span class="p">())))</span>
234234
<span class="n">requires</span> <span class="n"><a href="../input_iterator.html">input_iterator</a></span><span class="o">&lt;</span><span class="n">I</span><span class="o">&gt;</span><span class="p">;</span>
235235
<span class="p">};</span>
@@ -257,8 +257,8 @@ <h2>例</h2>
257257
<span class="kt">int</span> <span class="nf">main</span><span class="p">()</span> <span class="p">{</span>
258258
<span class="n"><a href="../../vector/vector.html">std::vector</a></span><span class="o">&lt;</span><span class="kt">int</span><span class="o">&gt;</span> <span class="n">vec</span> <span class="o">=</span> <span class="p">{</span><span class="mi">1</span><span class="p">,</span> <span class="mi">2</span><span class="p">,</span> <span class="mi">3</span><span class="p">,</span> <span class="mi">4</span><span class="p">,</span> <span class="mi">5</span><span class="p">,</span> <span class="mi">6</span><span class="p">,</span> <span class="mi">7</span><span class="p">,</span> <span class="mi">8</span><span class="p">,</span> <span class="mi">9</span><span class="p">};</span>
259259

260-
<span class="c1">// common_iteratorを通すことでイテレータ型と番兵型を合わせる</span>
261-
<span class="k">using</span> <span class="n">CI</span> <span class="o">=</span> <span class="n">std</span><span class="o">::</span><span class="n">common_iterator</span><span class="o">&lt;</span><span class="n">std</span><span class="o">::</span><span class="n">counted_iterator</span><span class="o">&lt;</span><span class="n"><a href="../../vector/vector.html">std::vector</a></span><span class="o">&lt;</span><span class="kt">int</span><span class="o">&gt;::</span><span class="n">iterator</span><span class="o">&gt;</span><span class="p">,</span> <span class="n">std</span><span class="o">::</span><span class="n"><a href="../default_sentinel_t.html">default_sentinel_t</a></span><span class="o">&gt;</span><span class="p">;</span>
260+
<span class="c1">// <a href="../common_iterator.html">common_iterator</a>を通すことでイテレータ型と番兵型を合わせる</span>
261+
<span class="k">using</span> <span class="n">CI</span> <span class="o">=</span> <span class="n">std</span><span class="o">::</span><span class="n"><a href="../common_iterator.html">common_iterator</a></span><span class="o">&lt;</span><span class="n">std</span><span class="o">::</span><span class="n">counted_iterator</span><span class="o">&lt;</span><span class="n"><a href="../../vector/vector.html">std::vector</a></span><span class="o">&lt;</span><span class="kt">int</span><span class="o">&gt;::</span><span class="n">iterator</span><span class="o">&gt;</span><span class="p">,</span> <span class="n">std</span><span class="o">::</span><span class="n"><a href="../default_sentinel_t.html">default_sentinel_t</a></span><span class="o">&gt;</span><span class="p">;</span>
262262

263263
<span class="n">CI</span> <span class="n">ci</span><span class="p">{</span><span class="n">std</span><span class="o">::</span><span class="n">counted_iterator</span><span class="p">{</span><span class="n">std</span><span class="o">::</span><span class="n"><a href="../../ranges/begin.html">ranges::begin</a></span><span class="p">(</span><span class="n">vec</span><span class="p">),</span> <span class="mi">5</span><span class="p">}};</span>
264264

0 commit comments

Comments
 (0)