https://gcc.gnu.org/g:3687dcfabfaae566f4b42aa8a805869b809e6247

commit r13-8815-g3687dcfabfaae566f4b42aa8a805869b809e6247
Author: Jonathan Wakely <jwak...@redhat.com>
Date:   Wed May 29 10:59:48 2024 +0100

    libstdc++: Replace link to gcc-4.3.2 docs in manual [PR115269]
    
    Link to the docs for GCC trunk instead. For the release branches, the
    link should be to the docs for appropriate release branch.
    
    Also replace the incomplete/outdated list of explicit -std options with
    a single entry for the -std option.
    
    libstdc++-v3/ChangeLog:
    
            PR libstdc++/115269
            * doc/xml/manual/using.xml: Replace link to gcc-4.3.2 docs.
            Replace list of -std=... options with a single entry for -std.
            * doc/html/manual/using.html: Regenerate.
    
    (cherry picked from commit b460ede64f9471589822831e04eecff4a3dbecf2)

Diff:
---
 libstdc++-v3/doc/html/manual/using.html | 10 ++++++----
 libstdc++-v3/doc/xml/manual/using.xml   | 33 +++++----------------------------
 2 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/libstdc++-v3/doc/html/manual/using.html 
b/libstdc++-v3/doc/html/manual/using.html
index e8e0c6c0e85..144ca80e030 100644
--- a/libstdc++-v3/doc/html/manual/using.html
+++ b/libstdc++-v3/doc/html/manual/using.html
@@ -4,7 +4,7 @@
   
 </th><td width="20%" align="right"> <a accesskey="n" 
href="using_headers.html">Next</a></td></tr></table><hr /></div><div 
class="chapter"><div class="titlepage"><div><div><h2 class="title"><a 
id="manual.intro.using"></a>Chapter 3. Using</h2></div></div></div><div 
class="toc"><p><strong>Table of Contents</strong></p><dl class="toc"><dt><span 
class="section"><a href="using.html#manual.intro.using.flags">Command 
Options</a></span></dt><dt><span class="section"><a 
href="using_headers.html">Headers</a></span></dt><dd><dl><dt><span 
class="section"><a 
href="using_headers.html#manual.intro.using.headers.all">Header 
Files</a></span></dt><dt><span class="section"><a 
href="using_headers.html#manual.intro.using.headers.mixing">Mixing 
Headers</a></span></dt><dt><span class="section"><a 
href="using_headers.html#manual.intro.using.headers.cheaders">The C Headers and 
<code class="code">namespace std</code></a></span></dt><dt><span 
class="section"><a href="using_headers.html#manual.intro.using.he
 aders.pre">Precompiled Headers</a></span></dt></dl></dd><dt><span 
class="section"><a href="using_macros.html">Macros</a></span></dt><dt><span 
class="section"><a href="using_dual_abi.html">Dual 
ABI</a></span></dt><dd><dl><dt><span class="section"><a 
href="using_dual_abi.html#manual.intro.using.abi.trouble">Troubleshooting</a></span></dt></dl></dd><dt><span
 class="section"><a 
href="using_namespaces.html">Namespaces</a></span></dt><dd><dl><dt><span 
class="section"><a 
href="using_namespaces.html#manual.intro.using.namespaces.all">Available 
Namespaces</a></span></dt><dt><span class="section"><a 
href="using_namespaces.html#manual.intro.using.namespaces.std">namespace 
std</a></span></dt><dt><span class="section"><a 
href="using_namespaces.html#manual.intro.using.namespaces.comp">Using Namespace 
Composition</a></span></dt></dl></dd><dt><span class="section"><a 
href="using_dynamic_or_shared.html">Linking</a></span></dt><dd><dl><dt><span 
class="section"><a href="using_dynamic_or_shared.html#ma
 nual.intro.using.linkage.freestanding">Almost Nothing</a></span></dt><dt><span 
class="section"><a 
href="using_dynamic_or_shared.html#manual.intro.using.linkage.dynamic">Finding 
Dynamic or Shared Libraries</a></span></dt><dt><span class="section"><a 
href="using_dynamic_or_shared.html#manual.intro.using.linkage.experimental">Experimental
 Library Extensions</a></span></dt></dl></dd><dt><span class="section"><a 
href="using_concurrency.html">Concurrency</a></span></dt><dd><dl><dt><span 
class="section"><a 
href="using_concurrency.html#manual.intro.using.concurrency.prereq">Prerequisites</a></span></dt><dt><span
 class="section"><a 
href="using_concurrency.html#manual.intro.using.concurrency.thread_safety">Thread
 Safety</a></span></dt><dt><span class="section"><a 
href="using_concurrency.html#manual.intro.using.concurrency.atomics">Atomics</a></span></dt><dt><span
 class="section"><a 
href="using_concurrency.html#manual.intro.using.concurrency.io">IO</a></span></dt><dd><dl><dt><span
 class="secti
 on"><a 
href="using_concurrency.html#concurrency.io.structure">Structure</a></span></dt><dt><span
 class="section"><a 
href="using_concurrency.html#concurrency.io.defaults">Defaults</a></span></dt><dt><span
 class="section"><a 
href="using_concurrency.html#concurrency.io.future">Future</a></span></dt><dt><span
 class="section"><a 
href="using_concurrency.html#concurrency.io.alt">Alternatives</a></span></dt></dl></dd><dt><span
 class="section"><a 
href="using_concurrency.html#manual.intro.using.concurrency.containers">Containers</a></span></dt></dl></dd><dt><span
 class="section"><a 
href="using_exceptions.html">Exceptions</a></span></dt><dd><dl><dt><span 
class="section"><a 
href="using_exceptions.html#intro.using.exception.safety">Exception 
Safety</a></span></dt><dt><span class="section"><a 
href="using_exceptions.html#intro.using.exception.propagating">Exception 
Neutrality</a></span></dt><dt><span class="section"><a 
href="using_exceptions.html#intro.using.exception.alloc">Memory allocation</a><
 /span></dt><dt><span class="section"><a 
href="using_exceptions.html#intro.using.exception.no">Doing 
without</a></span></dt><dt><span class="section"><a 
href="using_exceptions.html#intro.using.exception.compat">Compatibility</a></span></dt><dd><dl><dt><span
 class="section"><a href="using_exceptions.html#using.exception.compat.c">With 
<code class="literal">C</code></a></span></dt><dt><span class="section"><a 
href="using_exceptions.html#using.exception.compat.posix">With <code 
class="literal">POSIX</code> thread 
cancellation</a></span></dt></dl></dd></dl></dd><dt><span class="section"><a 
href="debug.html">Debugging Support</a></span></dt><dd><dl><dt><span 
class="section"><a href="debug.html#debug.compiler">Using <span 
class="command"><strong>g++</strong></span></a></span></dt><dt><span 
class="section"><a href="debug.html#debug.req">Debug Versions of Library Binary 
Files</a></span></dt><dt><span class="section"><a 
href="debug.html#debug.memory">Memory Leak Hunting</a></span></dt><dd><dl
 ><dt><span class="section"><a 
 >href="debug.html#debug.memory.mtalloc">Non-memory leaks in Pool and MT 
 >allocators</a></span></dt></dl></dd><dt><span class="section"><a 
 >href="debug.html#debug.races">Data Race Hunting</a></span></dt><dt><span 
 >class="section"><a href="debug.html#debug.gdb">Using <span 
 >class="command"><strong>gdb</strong></span></a></span></dt><dt><span 
 >class="section"><a href="debug.html#debug.exceptions">Tracking uncaught 
 >exceptions</a></span></dt><dt><span class="section"><a 
 >href="debug.html#debug.debug_mode">Debug Mode</a></span></dt><dt><span 
 >class="section"><a href="debug.html#debug.compile_time_checks">Compile Time 
 >Checking</a></span></dt></dl></dd></dl></div><div class="section"><div 
 >class="titlepage"><div><div><h2 class="title" style="clear: both"><a 
 >id="manual.intro.using.flags"></a>Command Options</h2></div></div></div><p>
       The set of features available in the GNU C++ library is shaped by
-      several <a class="link" 
href="http://gcc.gnu.org/onlinedocs/gcc-4.3.2/gcc/Invoking-GCC.html"; 
target="_top">GCC
+      several <a class="link" 
href="https://gcc.gnu.org/onlinedocs/gcc-13.1.0/gcc/Invoking-GCC.html"; 
target="_top">GCC
       Command Options</a>. Options that impact libstdc++ are
       enumerated and detailed in the table below.
     </p><p>
@@ -14,9 +14,11 @@
       <span class="command"><strong>g++ -std=gnu++17</strong></span> since GCC 
11, and
       <span class="command"><strong>g++ -std=gnu++14</strong></span> in GCC 6, 
7, 8, 9, and 10, and
       <span class="command"><strong>g++ -std=gnu++98</strong></span> for older 
releases.
-    </p><div class="table"><a id="table.cmd_options"></a><p 
class="title"><strong>Table 3.1. C++ Command Options</strong></p><div 
class="table-contents"><table class="table" summary="C++ Command Options" 
border="1"><colgroup><col align="left" class="c1" /><col align="left" 
class="c2" /></colgroup><thead><tr><th align="left">Option Flags</th><th 
align="left">Description</th></tr></thead><tbody><tr><td align="left"><code 
class="literal">-std=c++98</code> or <code class="literal">-std=c++03</code>
-      </td><td align="left">Use the 1998 ISO C++ standard plus 
amendments.</td></tr><tr><td align="left"><code 
class="literal">-std=gnu++98</code> or <code class="literal">-std=gnu++03</code>
-      </td><td align="left">As directly above, with GNU 
extensions.</td></tr><tr><td align="left"><code 
class="literal">-std=c++11</code></td><td align="left">Use the 2011 ISO C++ 
standard.</td></tr><tr><td align="left"><code 
class="literal">-std=gnu++11</code></td><td align="left">As directly above, 
with GNU extensions.</td></tr><tr><td align="left"><code 
class="literal">-std=c++14</code></td><td align="left">Use the 2014 ISO C++ 
standard.</td></tr><tr><td align="left"><code 
class="literal">-std=gnu++14</code></td><td align="left">As directly above, 
with GNU extensions.</td></tr><tr><td align="left">
+    </p><div class="table"><a id="table.cmd_options"></a><p 
class="title"><strong>Table 3.1. C++ Command Options</strong></p><div 
class="table-contents"><table class="table" summary="C++ Command Options" 
border="1"><colgroup><col align="left" class="c1" /><col align="left" 
class="c2" /></colgroup><thead><tr><th align="left">Option Flags</th><th 
align="left">Description</th></tr></thead><tbody><tr><td align="left"><code 
class="literal">-std</code>
+      </td><td align="left">
+       Select the C++ standard, and whether to use the base standard
+       or GNU dialect.
+      </td></tr><tr><td align="left">
        <code class="literal">-fno-exceptions</code>
       </td><td align="left">See <a class="link" 
href="using_exceptions.html#intro.using.exception.no" title="Doing 
without">exception-free dialect</a></td></tr><tr><td align="left">
        <code class="literal">-fno-rtti</code>
diff --git a/libstdc++-v3/doc/xml/manual/using.xml 
b/libstdc++-v3/doc/xml/manual/using.xml
index 7276cad0feb..42890f3b180 100644
--- a/libstdc++-v3/doc/xml/manual/using.xml
+++ b/libstdc++-v3/doc/xml/manual/using.xml
@@ -7,7 +7,7 @@
 
     <para>
       The set of features available in the GNU C++ library is shaped by
-      several <link xmlns:xlink="http://www.w3.org/1999/xlink"; 
xlink:href="http://gcc.gnu.org/onlinedocs/gcc-4.3.2/gcc/Invoking-GCC.html";>GCC
+      several <link xmlns:xlink="http://www.w3.org/1999/xlink"; 
xlink:href="https://gcc.gnu.org/onlinedocs/gcc-13.1.0/gcc/Invoking-GCC.html";>GCC
       Command Options</link>. Options that impact libstdc++ are
       enumerated and detailed in the table below.
     </para>
@@ -37,35 +37,12 @@
 
   <tbody>
     <row>
-      <entry><literal>-std=c++98</literal> or <literal>-std=c++03</literal>
+      <entry><literal>-std</literal>
       </entry>
-      <entry>Use the 1998 ISO C++ standard plus amendments.</entry>
-    </row>
-
-    <row>
-      <entry><literal>-std=gnu++98</literal> or <literal>-std=gnu++03</literal>
+      <entry>
+       Select the C++ standard, and whether to use the base standard
+       or GNU dialect.
       </entry>
-      <entry>As directly above, with GNU extensions.</entry>
-    </row>
-
-    <row>
-      <entry><literal>-std=c++11</literal></entry>
-      <entry>Use the 2011 ISO C++ standard.</entry>
-    </row>
-
-    <row>
-      <entry><literal>-std=gnu++11</literal></entry>
-      <entry>As directly above, with GNU extensions.</entry>
-    </row>
-
-    <row>
-      <entry><literal>-std=c++14</literal></entry>
-      <entry>Use the 2014 ISO C++ standard.</entry>
-    </row>
-
-    <row>
-      <entry><literal>-std=gnu++14</literal></entry>
-      <entry>As directly above, with GNU extensions.</entry>
     </row>
 
     <row>

Reply via email to