From: Gerald Pfeifer <gerald@pfeifer.com>
Date: Thu, 2 Mar 2017 19:11:50 +0000 (+0000)
Subject: debug_mode.xml: Update and simplify note on link- and run-time coexistence.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1a5a334e7839b2fe8a200c60af066e836ceff12c;p=gcc.git

debug_mode.xml: Update and simplify note on link- and run-time coexistence.

	* doc/xml/manual/debug_mode.xml: Update and simplify note
	on link- and run-time coexistence.

Co-Authored-By: François Dumont <frs.dumont@gmail.com>
Co-Authored-By: Jonathan Wakely <jwakely@redhat.com>

From-SVN: r245848
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a4ccd115d38..6a63daf0b7c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2017-03-02  Gerald Pfeifer  <gerald@pfeifer.com>
+	    François Dumont  <frs.dumont@gmail.com>
+	    Jonathan Wakely  <jwakely@redhat.com>
+
+	* doc/xml/manual/debug_mode.xml: Update and simplify note
+	on link- and run-time coexistence.
+
 2017-03-02  Jonathan Wakely  <jwakely@redhat.com>
 
 	* testsuite/17_intro/headers/names.cc: Rename to ...
diff --git a/libstdc++-v3/doc/xml/manual/debug_mode.xml b/libstdc++-v3/doc/xml/manual/debug_mode.xml
index 9e97a1ddbe7..65abf051674 100644
--- a/libstdc++-v3/doc/xml/manual/debug_mode.xml
+++ b/libstdc++-v3/doc/xml/manual/debug_mode.xml
@@ -584,15 +584,11 @@ template&lt;typename _Tp, typename _Allocator = allocator&lt;_Tp&gt;
   environments by minimizing dependencies.</para>
 
 <para>Achieving link- and run-time coexistence is not a trivial
-  implementation task. To achieve this goal we required a small
-  extension to the GNU C++ compiler (since incorporated into the C++11 language specification, described in the GCC Manual for the C++ language as
-  <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://gcc.gnu.org/onlinedocs/gcc/Namespace-Association.html#Namespace-Association">namespace
-  association</link>), and a complex organization of debug- and
-  release-modes. The end result is that we have achieved per-use
-  recompilation but have had to give up some checking of the
-  <code>std::basic_string</code> class template (namely, safe
-  iterators).
-</para>
+  implementation task. To achieve this goal we use inline namespaces and
+  a complex organization of debug- and release-modes. The end result is
+  that we have achieved per-use recompilation but have had to give up
+  some checking of the <code>std::basic_string</code> class template
+  (namely, safe iterators).</para>
 
  <section xml:id="methods.coexistence.compile" xreflabel="Compile"><info><title>Compile-time coexistence of release- and debug-mode components</title></info>