aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/doc/extend.texi7
2 files changed, 7 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 937eaa4..7c2a800 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-11 Jonathan Wakely <jwakely.gcc@gmail.com>
+
+ * doc/extend.texi (Namespace Association): Alter cautionary text.
+
2012-07-10 Oleg Endo <olegendo@gcc.gnu.org>
PR target/53911
diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi
index 91e7385..c3faf09 100644
--- a/gcc/doc/extend.texi
+++ b/gcc/doc/extend.texi
@@ -15527,10 +15527,9 @@ See also @ref{Namespace Association}.
@node Namespace Association
@section Namespace Association
-@strong{Caution:} The semantics of this extension are not fully
-defined. Users should refrain from using this extension as its
-semantics may change subtly over time. It is possible that this
-extension will be removed in future versions of G++.
+@strong{Caution:} The semantics of this extension are equivalent
+to C++ 2011 inline namespaces. Users should use inline namespaces
+instead as this extension will be removed in future versions of G++.
A using-directive with @code{__attribute ((strong))} is stronger
than a normal using-directive in two ways: