Skip to content

Commit 16e4970

Browse files
authored
Merge pull request #28 from jhcarl0814/gh-pages_20260502_emplace_push_back_push_front
fix conflicting ids `emplace`, `push_back`, `push_front`
2 parents 32326bb + 3b015d4 commit 16e4970

12 files changed

Lines changed: 12 additions & 12 deletions

n3337/containers.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1910,7 +1910,7 @@
19101910
</p></div></div><p ><span class='indexparent'><a class='index' id='shrink_to_fit,deque'></a></span><span class='indexparent'><a class='index' id='deque,shrink_to_fit'></a></span><code class='itemdecl'>
19111911
void shrink_to_fit();
19121912
</code></p><div class='itemdescr'></div><div class='para' id='deque.capacity-5'><div class='marginalizedparent'><a class='marginalized' href='#deque.capacity-5'>5</a></div><div class='itemdescr'><p ><i>Remarks:</i> <span class='texttt'>shrink_to_fit</span> is a non-binding request to reduce memory use. [&nbsp;<i>Note:</i> The request is non-binding to allow latitude for implementation-specific optimizations. <i>&nbsp;—&nbsp;end note</i>&nbsp;]
1913-
</p></div></div></div><div id='deque.modifiers'><h4 ><a class='secnum' href='#deque.modifiers' style='min-width:118pt'>23.3.3.4</a> <span class='texttt'>deque</span> modifiers <a class='abbr_ref' href='deque.modifiers'>[deque.modifiers]</a></h4><p ><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><code class='itemdecl'>
1913+
</p></div></div></div><div id='deque.modifiers'><h4 ><a class='secnum' href='#deque.modifiers' style='min-width:118pt'>23.3.3.4</a> <span class='texttt'>deque</span> modifiers <a class='abbr_ref' href='deque.modifiers'>[deque.modifiers]</a></h4><p ><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='push_front,deque'></a></span><span class='indexparent'><a class='index' id='push_back,deque'></a></span><span class='indexparent'><a class='index' id='emplace,deque'></a></span><code class='itemdecl'>
19141914
iterator insert(const_iterator position, const T&amp; x);
19151915
iterator insert(const_iterator position, T&amp;&amp; x);
19161916
iterator insert(const_iterator position, size_type n, const T&amp; x);

n3337/deque.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
</p></div></div><p ><span class='indexparent'><a class='index' id='shrink_to_fit,deque'></a></span><span class='indexparent'><a class='index' id='deque,shrink_to_fit'></a></span><code class='itemdecl'>
196196
void shrink_to_fit();
197197
</code></p><div class='itemdescr'></div><div class='para' id='capacity-5'><div class='marginalizedparent'><a class='marginalized' href='#capacity-5'>5</a></div><div class='itemdescr'><p ><i>Remarks:</i> <span class='texttt'>shrink_to_fit</span> is a non-binding request to reduce memory use. [&nbsp;<i>Note:</i> The request is non-binding to allow latitude for implementation-specific optimizations. <i>&nbsp;—&nbsp;end note</i>&nbsp;]
198-
</p></div></div></div><div id='modifiers'><h4 ><a class='secnum' href='#modifiers' style='min-width:118pt'>23.3.3.4</a> <span class='texttt'>deque</span> modifiers <a class='abbr_ref' href='deque.modifiers'>[deque.modifiers]</a></h4><p ><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><code class='itemdecl'>
198+
</p></div></div></div><div id='modifiers'><h4 ><a class='secnum' href='#modifiers' style='min-width:118pt'>23.3.3.4</a> <span class='texttt'>deque</span> modifiers <a class='abbr_ref' href='deque.modifiers'>[deque.modifiers]</a></h4><p ><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='push_front,deque'></a></span><span class='indexparent'><a class='index' id='push_back,deque'></a></span><span class='indexparent'><a class='index' id='emplace,deque'></a></span><code class='itemdecl'>
199199
iterator insert(const_iterator position, const T&amp; x);
200200
iterator insert(const_iterator position, T&amp;&amp; x);
201201
iterator insert(const_iterator position, size_type n, const T&amp; x);

n3337/deque.modifiers.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html><html lang='en'><head><title>[deque.modifiers]</title><meta charset='UTF-8'/><link rel='stylesheet' type='text/css' href='14882.css'/></head><body><div class='wrapper'><h1 ><a class='secnum' style='min-width:73pt'>23</a> Containers library <a class='abbr_ref' href='./#containers'>[containers]</a></h1><h2 ><a class='secnum' style='min-width:88pt'>23.3</a> Sequence containers <a class='abbr_ref' href='sequences#deque.modifiers'>[sequences]</a></h2><h3 ><a class='secnum' style='min-width:103pt'>23.3.3</a> Class template <span class='texttt'>deque</span> <a class='abbr_ref' href='deque#modifiers'>[deque]</a></h3><div id='deque.modifiers'><h4 ><a class='secnum' style='min-width:118pt'>23.3.3.4</a> <span class='texttt'>deque</span> modifiers <a class='abbr_ref'>[deque.modifiers]</a></h4><p ><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><code class='itemdecl'>
1+
<!DOCTYPE html><html lang='en'><head><title>[deque.modifiers]</title><meta charset='UTF-8'/><link rel='stylesheet' type='text/css' href='14882.css'/></head><body><div class='wrapper'><h1 ><a class='secnum' style='min-width:73pt'>23</a> Containers library <a class='abbr_ref' href='./#containers'>[containers]</a></h1><h2 ><a class='secnum' style='min-width:88pt'>23.3</a> Sequence containers <a class='abbr_ref' href='sequences#deque.modifiers'>[sequences]</a></h2><h3 ><a class='secnum' style='min-width:103pt'>23.3.3</a> Class template <span class='texttt'>deque</span> <a class='abbr_ref' href='deque#modifiers'>[deque]</a></h3><div id='deque.modifiers'><h4 ><a class='secnum' style='min-width:118pt'>23.3.3.4</a> <span class='texttt'>deque</span> modifiers <a class='abbr_ref'>[deque.modifiers]</a></h4><p ><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='push_front,deque'></a></span><span class='indexparent'><a class='index' id='push_back,deque'></a></span><span class='indexparent'><a class='index' id='emplace,deque'></a></span><code class='itemdecl'>
22
iterator insert(const_iterator position, const T&amp; x);
33
iterator insert(const_iterator position, T&amp;&amp; x);
44
iterator insert(const_iterator position, size_type n, const T&amp; x);

n3337/full.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45236,7 +45236,7 @@
4523645236
</p></div></div><p ><span class='indexparent'><a class='index' id='shrink_to_fit,deque'></a></span><span class='indexparent'><a class='index' id='deque,shrink_to_fit'></a></span><code class='itemdecl'>
4523745237
void shrink_to_fit();
4523845238
</code></p><div class='itemdescr'></div><div class='para' id='deque.capacity-5'><div class='marginalizedparent'><a class='marginalized' href='#deque.capacity-5'>5</a></div><div class='itemdescr'><p ><i>Remarks:</i> <span class='texttt'>shrink_to_fit</span> is a non-binding request to reduce memory use. [&nbsp;<i>Note:</i> The request is non-binding to allow latitude for implementation-specific optimizations. <i>&nbsp;—&nbsp;end note</i>&nbsp;]
45239-
</p></div></div></div><div id='deque.modifiers'><h4 ><a class='secnum' href='#deque.modifiers' style='min-width:118pt'>23.3.3.4</a> <span class='texttt'>deque</span> modifiers <a class='abbr_ref' href='deque.modifiers'>[deque.modifiers]</a></h4><p ><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><code class='itemdecl'>
45239+
</p></div></div></div><div id='deque.modifiers'><h4 ><a class='secnum' href='#deque.modifiers' style='min-width:118pt'>23.3.3.4</a> <span class='texttt'>deque</span> modifiers <a class='abbr_ref' href='deque.modifiers'>[deque.modifiers]</a></h4><p ><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='push_front,deque'></a></span><span class='indexparent'><a class='index' id='push_back,deque'></a></span><span class='indexparent'><a class='index' id='emplace,deque'></a></span><code class='itemdecl'>
4524045240
iterator insert(const_iterator position, const T&amp; x);
4524145241
iterator insert(const_iterator position, T&amp;&amp; x);
4524245242
iterator insert(const_iterator position, size_type n, const T&amp; x);

n3337/libraryindex.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

n3337/sequences.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@
446446
</p></div></div><p ><span class='indexparent'><a class='index' id='shrink_to_fit,deque'></a></span><span class='indexparent'><a class='index' id='deque,shrink_to_fit'></a></span><code class='itemdecl'>
447447
void shrink_to_fit();
448448
</code></p><div class='itemdescr'></div><div class='para' id='deque.capacity-5'><div class='marginalizedparent'><a class='marginalized' href='#deque.capacity-5'>5</a></div><div class='itemdescr'><p ><i>Remarks:</i> <span class='texttt'>shrink_to_fit</span> is a non-binding request to reduce memory use. [&nbsp;<i>Note:</i> The request is non-binding to allow latitude for implementation-specific optimizations. <i>&nbsp;—&nbsp;end note</i>&nbsp;]
449-
</p></div></div></div><div id='deque.modifiers'><h4 ><a class='secnum' href='#deque.modifiers' style='min-width:118pt'>23.3.3.4</a> <span class='texttt'>deque</span> modifiers <a class='abbr_ref' href='deque.modifiers'>[deque.modifiers]</a></h4><p ><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><code class='itemdecl'>
449+
</p></div></div></div><div id='deque.modifiers'><h4 ><a class='secnum' href='#deque.modifiers' style='min-width:118pt'>23.3.3.4</a> <span class='texttt'>deque</span> modifiers <a class='abbr_ref' href='deque.modifiers'>[deque.modifiers]</a></h4><p ><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='push_front,deque'></a></span><span class='indexparent'><a class='index' id='push_back,deque'></a></span><span class='indexparent'><a class='index' id='emplace,deque'></a></span><code class='itemdecl'>
450450
iterator insert(const_iterator position, const T&amp; x);
451451
iterator insert(const_iterator position, T&amp;&amp; x);
452452
iterator insert(const_iterator position, size_type n, const T&amp; x);

n4140/containers.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2015,7 +2015,7 @@
20152015
void shrink_to_fit();
20162016
</code></p><div class='itemdescr'></div><div class='para' id='deque.capacity-5'><div class='marginalizedparent'><a class='marginalized' href='#deque.capacity-5'>5</a></div><div class='itemdescr'><p ><i>Requires:</i> <span class='texttt'>T</span> shall be <span class='texttt'>MoveInsertable</span> into <span class='texttt'>*this</span>.</p></div></div><div class='para' id='deque.capacity-6'><div class='marginalizedparent'><a class='marginalized' href='#deque.capacity-6'>6</a></div><div class='itemdescr'><p ><i>Complexity:</i> Linear in the size of the sequence.</p></div></div><div class='para' id='deque.capacity-7'><div class='marginalizedparent'><a class='marginalized' href='#deque.capacity-7'>7</a></div><div class='itemdescr'><p ><i>Remarks:</i> <span class='texttt'>shrink_to_fit</span> is a non-binding request to reduce memory use
20172017
but does not change the size of the sequence. [&nbsp;<i>Note:</i> The request is non-binding to allow latitude for implementation-specific optimizations. <i>&nbsp;—&nbsp;end note</i>&nbsp;]
2018-
</p></div></div></div><div id='deque.modifiers'><h4 ><a class='secnum' href='#deque.modifiers' style='min-width:118pt'>23.3.3.4</a> <span class='texttt'>deque</span> modifiers <a class='abbr_ref' href='deque.modifiers'>[deque.modifiers]</a></h4><p ><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><code class='itemdecl'>
2018+
</p></div></div></div><div id='deque.modifiers'><h4 ><a class='secnum' href='#deque.modifiers' style='min-width:118pt'>23.3.3.4</a> <span class='texttt'>deque</span> modifiers <a class='abbr_ref' href='deque.modifiers'>[deque.modifiers]</a></h4><p ><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='push_front,deque'></a></span><span class='indexparent'><a class='index' id='push_back,deque'></a></span><span class='indexparent'><a class='index' id='emplace,deque'></a></span><code class='itemdecl'>
20192019
iterator insert(const_iterator position, const T&amp; x);
20202020
iterator insert(const_iterator position, T&amp;&amp; x);
20212021
iterator insert(const_iterator position, size_type n, const T&amp; x);

n4140/deque.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
void shrink_to_fit();
179179
</code></p><div class='itemdescr'></div><div class='para' id='capacity-5'><div class='marginalizedparent'><a class='marginalized' href='#capacity-5'>5</a></div><div class='itemdescr'><p ><i>Requires:</i> <span class='texttt'>T</span> shall be <span class='texttt'>MoveInsertable</span> into <span class='texttt'>*this</span>.</p></div></div><div class='para' id='capacity-6'><div class='marginalizedparent'><a class='marginalized' href='#capacity-6'>6</a></div><div class='itemdescr'><p ><i>Complexity:</i> Linear in the size of the sequence.</p></div></div><div class='para' id='capacity-7'><div class='marginalizedparent'><a class='marginalized' href='#capacity-7'>7</a></div><div class='itemdescr'><p ><i>Remarks:</i> <span class='texttt'>shrink_to_fit</span> is a non-binding request to reduce memory use
180180
but does not change the size of the sequence. [&nbsp;<i>Note:</i> The request is non-binding to allow latitude for implementation-specific optimizations. <i>&nbsp;—&nbsp;end note</i>&nbsp;]
181-
</p></div></div></div><div id='modifiers'><h4 ><a class='secnum' href='#modifiers' style='min-width:118pt'>23.3.3.4</a> <span class='texttt'>deque</span> modifiers <a class='abbr_ref' href='deque.modifiers'>[deque.modifiers]</a></h4><p ><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><code class='itemdecl'>
181+
</p></div></div></div><div id='modifiers'><h4 ><a class='secnum' href='#modifiers' style='min-width:118pt'>23.3.3.4</a> <span class='texttt'>deque</span> modifiers <a class='abbr_ref' href='deque.modifiers'>[deque.modifiers]</a></h4><p ><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='push_front,deque'></a></span><span class='indexparent'><a class='index' id='push_back,deque'></a></span><span class='indexparent'><a class='index' id='emplace,deque'></a></span><code class='itemdecl'>
182182
iterator insert(const_iterator position, const T&amp; x);
183183
iterator insert(const_iterator position, T&amp;&amp; x);
184184
iterator insert(const_iterator position, size_type n, const T&amp; x);

n4140/deque.modifiers.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html><html lang='en'><head><title>[deque.modifiers]</title><meta charset='UTF-8'/><link rel='stylesheet' type='text/css' href='14882.css'/></head><body><div class='wrapper'><h1 ><a class='secnum' style='min-width:73pt'>23</a> Containers library <a class='abbr_ref' href='./#containers'>[containers]</a></h1><h2 ><a class='secnum' style='min-width:88pt'>23.3</a> Sequence containers <a class='abbr_ref' href='sequences#deque.modifiers'>[sequences]</a></h2><h3 ><a class='secnum' style='min-width:103pt'>23.3.3</a> Class template <span class='texttt'>deque</span> <a class='abbr_ref' href='deque#modifiers'>[deque]</a></h3><div id='deque.modifiers'><h4 ><a class='secnum' style='min-width:118pt'>23.3.3.4</a> <span class='texttt'>deque</span> modifiers <a class='abbr_ref'>[deque.modifiers]</a></h4><p ><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><code class='itemdecl'>
1+
<!DOCTYPE html><html lang='en'><head><title>[deque.modifiers]</title><meta charset='UTF-8'/><link rel='stylesheet' type='text/css' href='14882.css'/></head><body><div class='wrapper'><h1 ><a class='secnum' style='min-width:73pt'>23</a> Containers library <a class='abbr_ref' href='./#containers'>[containers]</a></h1><h2 ><a class='secnum' style='min-width:88pt'>23.3</a> Sequence containers <a class='abbr_ref' href='sequences#deque.modifiers'>[sequences]</a></h2><h3 ><a class='secnum' style='min-width:103pt'>23.3.3</a> Class template <span class='texttt'>deque</span> <a class='abbr_ref' href='deque#modifiers'>[deque]</a></h3><div id='deque.modifiers'><h4 ><a class='secnum' style='min-width:118pt'>23.3.3.4</a> <span class='texttt'>deque</span> modifiers <a class='abbr_ref'>[deque.modifiers]</a></h4><p ><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='push_front,deque'></a></span><span class='indexparent'><a class='index' id='push_back,deque'></a></span><span class='indexparent'><a class='index' id='emplace,deque'></a></span><code class='itemdecl'>
22
iterator insert(const_iterator position, const T&amp; x);
33
iterator insert(const_iterator position, T&amp;&amp; x);
44
iterator insert(const_iterator position, size_type n, const T&amp; x);

n4140/full.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46969,7 +46969,7 @@
4696946969
void shrink_to_fit();
4697046970
</code></p><div class='itemdescr'></div><div class='para' id='deque.capacity-5'><div class='marginalizedparent'><a class='marginalized' href='#deque.capacity-5'>5</a></div><div class='itemdescr'><p ><i>Requires:</i> <span class='texttt'>T</span> shall be <span class='texttt'>MoveInsertable</span> into <span class='texttt'>*this</span>.</p></div></div><div class='para' id='deque.capacity-6'><div class='marginalizedparent'><a class='marginalized' href='#deque.capacity-6'>6</a></div><div class='itemdescr'><p ><i>Complexity:</i> Linear in the size of the sequence.</p></div></div><div class='para' id='deque.capacity-7'><div class='marginalizedparent'><a class='marginalized' href='#deque.capacity-7'>7</a></div><div class='itemdescr'><p ><i>Remarks:</i> <span class='texttt'>shrink_to_fit</span> is a non-binding request to reduce memory use
4697146971
but does not change the size of the sequence. [&nbsp;<i>Note:</i> The request is non-binding to allow latitude for implementation-specific optimizations. <i>&nbsp;—&nbsp;end note</i>&nbsp;]
46972-
</p></div></div></div><div id='deque.modifiers'><h4 ><a class='secnum' href='#deque.modifiers' style='min-width:118pt'>23.3.3.4</a> <span class='texttt'>deque</span> modifiers <a class='abbr_ref' href='deque.modifiers'>[deque.modifiers]</a></h4><p ><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='insert,deque'></a></span><code class='itemdecl'>
46972+
</p></div></div></div><div id='deque.modifiers'><h4 ><a class='secnum' href='#deque.modifiers' style='min-width:118pt'>23.3.3.4</a> <span class='texttt'>deque</span> modifiers <a class='abbr_ref' href='deque.modifiers'>[deque.modifiers]</a></h4><p ><span class='indexparent'><a class='index' id='insert,deque'></a></span><span class='indexparent'><a class='index' id='push_front,deque'></a></span><span class='indexparent'><a class='index' id='push_back,deque'></a></span><span class='indexparent'><a class='index' id='emplace,deque'></a></span><code class='itemdecl'>
4697346973
iterator insert(const_iterator position, const T&amp; x);
4697446974
iterator insert(const_iterator position, T&amp;&amp; x);
4697546975
iterator insert(const_iterator position, size_type n, const T&amp; x);

0 commit comments

Comments
 (0)