On 23/03/17 15:01 +0000, Jonathan Wakely wrote:
On 18/03/17 19:44 +0100, Gerald Pfeifer wrote:
On Wed, 15 Feb 2017, Jonathan Wakely wrote:
The C++14 standard is:
http://webstore.ansi.org/RecordDetail.aspx?sku=ISO%2fIEC+14882%3a2014

Thanks, Jonathan!

What do you think?
Should we make the FAQ link to the info in the manual, instead of just
removing it?

Great idea.  Unfortunately I do not know the Docbook magic to do
this for the libstdc++ documentation, so I went ahead with the
simple version below.

Can you perhaps help making this a "real" link?

Exactly how it's one on line 126 in that file. I'll commit this later.



commit 90a904a447d5153f1bca007b0b4a599e4d8a8731
Author: Jonathan Wakely <jwak...@redhat.com>
Date:   Thu Mar 23 15:00:06 2017 +0000

   Add link to the right section of the manual
* doc/xml/faq.xml: Add link.
        * doc/html/*: Regenerate.

diff --git a/libstdc++-v3/doc/xml/faq.xml b/libstdc++-v3/doc/xml/faq.xml
index db67626..340ba9d 100644
--- a/libstdc++-v3/doc/xml/faq.xml
+++ b/libstdc++-v3/doc/xml/faq.xml
@@ -1177,7 +1177,8 @@
  </question>
  <answer xml:id="a-get_iso_cxx">
    <para>
-    Please refer to the Contributing section in our manual.
+    Please refer to the <link linkend="appendix.contrib">Contributing</link>
+    section in our manual.
</para> </answer>
</qandaentry>


The attached patch also fixes some broken links that Gerald pointed
out.

I'm committing this to trunk today.

commit 38850ccfa6dadea710556d5f408cef79c2ffd9ec
Author: Jonathan Wakely <jwak...@redhat.com>
Date:   Thu Mar 23 15:00:06 2017 +0000

    Fix broken links in manual and remove outdated info
    
    	* doc/xml/faq.xml: Add link.
    	* doc/xml/manual/backwards_compatibility.xml: Remove outdated
    	information on pre-ISO headers. Replace broken link to C++ FAQ Lite.
    	* doc/xml/manual/io.xml: Update broken link.
    	* doc/html/*: Regenerate.

diff --git a/libstdc++-v3/doc/xml/faq.xml b/libstdc++-v3/doc/xml/faq.xml
index db67626..340ba9d 100644
--- a/libstdc++-v3/doc/xml/faq.xml
+++ b/libstdc++-v3/doc/xml/faq.xml
@@ -1177,7 +1177,8 @@
   </question>
   <answer xml:id="a-get_iso_cxx">
     <para>
-    Please refer to the Contributing section in our manual.
+    Please refer to the <link linkend="appendix.contrib">Contributing</link>
+    section in our manual.
     </para> 
   </answer>
 </qandaentry>
diff --git a/libstdc++-v3/doc/xml/manual/backwards_compatibility.xml b/libstdc++-v3/doc/xml/manual/backwards_compatibility.xml
index 579c368..dbb3371 100644
--- a/libstdc++-v3/doc/xml/manual/backwards_compatibility.xml
+++ b/libstdc++-v3/doc/xml/manual/backwards_compatibility.xml
@@ -598,86 +598,21 @@ libstdc++-v3.
 
 <para>Portability notes and known implementation limitations are as follows.</para>
 
-<section xml:id="backwards.third.headers"><info><title>Pre-ISO headers moved to backwards or removed</title></info>
+<section xml:id="backwards.third.headers"><info><title>Pre-ISO headers removed</title></info>
 
 
 <para> The pre-ISO C++ headers
       (<filename class="headerfile">&lt;iostream.h&gt;</filename>,
       <filename class="headerfile">&lt;defalloc.h&gt;</filename> etc.) are
-      available, unlike previous libstdc++ versions, but inclusion
-      generates a warning that you are using deprecated headers.
+      not supported.
 </para>
 
-    <para>This compatibility layer is constructed by including the
-    standard C++ headers, and injecting any items in
-    <code>std::</code> into the global namespace.
-   </para>
-   <para>For those of you new to ISO C++ (welcome, time travelers!), no,
-      that isn't a typo. Yes, the headers really have new names.
-      Marshall Cline's C++ FAQ Lite has a good explanation in <link xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="http://www.parashift.com/c++-faq-lite/std-headers.html";>What's
+   <para>For those of you new to ISO C++ (welcome, time travelers!), the
+      ancient pre-ISO headers have new names.
+      The C++ FAQ has a good explanation in <link xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="https://isocpp.org/wiki/faq/coding-standards#std-headers";>What's
       the difference between &lt;xxx&gt; and &lt;xxx.h&gt; headers?</link>.
    </para>
 
-<para> Some include adjustment may be required. What follows is an
-autoconf test that defines <code>PRE_STDCXX_HEADERS</code> when they
-exist.</para>
-
-<programlisting>
-# AC_HEADER_PRE_STDCXX
-AC_DEFUN([AC_HEADER_PRE_STDCXX], [
-  AC_CACHE_CHECK(for pre-ISO C++ include files,
-  ac_cv_cxx_pre_stdcxx,
-  [AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  ac_save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -Wno-deprecated"
-
-  # Omit defalloc.h, as compilation with newer compilers is problematic.
-  AC_TRY_COMPILE([
-  #include &lt;new.h&gt;
-  #include &lt;iterator.h&gt;
-  #include &lt;alloc.h&gt;
-  #include &lt;set.h&gt;
-  #include &lt;hashtable.h&gt;
-  #include &lt;hash_set.h&gt;
-  #include &lt;fstream.h&gt;
-  #include &lt;tempbuf.h&gt;
-  #include &lt;istream.h&gt;
-  #include &lt;bvector.h&gt;
-  #include &lt;stack.h&gt;
-  #include &lt;rope.h&gt;
-  #include &lt;complex.h&gt;
-  #include &lt;ostream.h&gt;
-  #include &lt;heap.h&gt;
-  #include &lt;iostream.h&gt;
-  #include &lt;function.h&gt;
-  #include &lt;multimap.h&gt;
-  #include &lt;pair.h&gt;
-  #include &lt;stream.h&gt;
-  #include &lt;iomanip.h&gt;
-  #include &lt;slist.h&gt;
-  #include &lt;tree.h&gt;
-  #include &lt;vector.h&gt;
-  #include &lt;deque.h&gt;
-  #include &lt;multiset.h&gt;
-  #include &lt;list.h&gt;
-  #include &lt;map.h&gt;
-  #include &lt;algobase.h&gt;
-  #include &lt;hash_map.h&gt;
-  #include &lt;algo.h&gt;
-  #include &lt;queue.h&gt;
-  #include &lt;streambuf.h&gt;
-  ],,
-  ac_cv_cxx_pre_stdcxx=yes, ac_cv_cxx_pre_stdcxx=no)
-  CXXFLAGS="$ac_save_CXXFLAGS"
-  AC_LANG_RESTORE
-  ])
-  if test "$ac_cv_cxx_pre_stdcxx" = yes; then
-    AC_DEFINE(PRE_STDCXX_HEADERS,,[Define if pre-ISO C++ header files are present. ])
-  fi
-])
-</programlisting>
-
 <para>Porting between pre-ISO headers and ISO headers is simple: headers
 like <filename class="headerfile">&lt;vector.h&gt;</filename> can be replaced with <filename class="headerfile">&lt;vector&gt;</filename> and a using
 directive <code>using namespace std;</code> can be put at the global
diff --git a/libstdc++-v3/doc/xml/manual/io.xml b/libstdc++-v3/doc/xml/manual/io.xml
index 36d04ff..0c069b3 100644
--- a/libstdc++-v3/doc/xml/manual/io.xml
+++ b/libstdc++-v3/doc/xml/manual/io.xml
@@ -240,9 +240,10 @@
     }
    </programlisting>
    <para>Try it yourself!  More examples can be found in 3.1.x code, in
-      <filename>include/ext/*_filebuf.h</filename>, and in this article by James Kanze:
-      <link xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="http://kanze.james.neuf.fr/articles/fltrsbf1.html";>Filtering
-      Streambufs</link>.
+      <filename>include/ext/*_filebuf.h</filename>, and in the article
+      <link xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="http://gabisoft.free.fr/articles/fltrsbf1.html";>Filtering
+      Streambufs</link>
+      by James Kanze.
    </para>
 
   </section>
diff --git a/libstdc++-v3/doc/xml/manual/using.xml b/libstdc++-v3/doc/xml/manual/using.xml
index 1970845..3057a93 100644
--- a/libstdc++-v3/doc/xml/manual/using.xml
+++ b/libstdc++-v3/doc/xml/manual/using.xml
@@ -1625,7 +1625,7 @@ gcc version 4.1.2 20070925 (Red Hat 4.1.2-33)
 
       <para>For further details of the C++11 memory model see Hans-J. Boehm's
       <link xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="https://www.hboehm.info/c++mm/";>Threads
-      and memory model for C++</link> pages, particularly the <link xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="http://www.hpl.hp.com/personal/Hans_Boehm/c++mm/threadsintro.html";>introduction</link> 
+      and memory model for C++</link> pages, particularly the <link xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="http://www.hboehm.info/c++mm/threadsintro.html";>introduction</link> 
       and <link xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="https://www.hboehm.info/c++mm/user-faq.html";>FAQ</link>.
       </para>
 

Reply via email to