aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Sidwell <nathan@acm.org>2018-02-16 19:08:07 +0000
committerNathan Sidwell <nathan@gcc.gnu.org>2018-02-16 19:08:07 +0000
commit5b2b92c563b862d369313ec32b2f421cd73d2500 (patch)
tree4a954cd993ac6b09b00bdb30d07c5b21184347d7
parentaaec81f10fa314fabdd9d7b07d2837b192bbd47d (diff)
downloadgcc-5b2b92c563b862d369313ec32b2f421cd73d2500.zip
gcc-5b2b92c563b862d369313ec32b2f421cd73d2500.tar.gz
gcc-5b2b92c563b862d369313ec32b2f421cd73d2500.tar.bz2
[C++ PATCH] Deprecate -ffriend-injection
https://gcc.gnu.org/ml/gcc-patches/2018-02/msg01020.html * doc/extend.texi (Backwards Compatibility): Americanize 'behaviour'. From-SVN: r257755
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/doc/extend.texi6
2 files changed, 7 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5bf2718..a2199d9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-16 Nathan Sidwell <nathan@acm.org>
+
+ * doc/extend.texi (Backwards Compatibility): Americanize 'behaviour'.
+
2018-02-16 Carl Love <cel@us.ibm.com>
* config/rs6000/rs6000-builtin.def: Add BU_P8V_VSX_2 macro definition.
diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi
index d38840e..b524009 100644
--- a/gcc/doc/extend.texi
+++ b/gcc/doc/extend.texi
@@ -23882,13 +23882,13 @@ deprecated. @xref{Deprecated Features}.
If a variable is declared at for scope, it used to remain in scope
until the end of the scope that contained the for statement (rather
than just within the for scope). The deprecated
-@option{-fno-for-scope} option enables this non-standard behaviour.
+@option{-fno-for-scope} option enables this non-standard behavior.
Without the option, G++ retains this, but issues a warning, if such a
variable is accessed outside the for scope.
-The behaviour is deprecated, only available with @option{-std=c++98}
+The behavior is deprecated, only available with @option{-std=c++98}
@option{-std=gnu++98} languages and you must use the
-@option{-fpermissive} option to enable it. The behaviour will be
+@option{-fpermissive} option to enable it. The behavior will be
removed.
@item Friend Injection