Update changelogs for revert of c++/69855.

From-SVN: r236850

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index cdc2f5a46fd808239965da67dd8da734acdf85e6..44022e781e790180ccaaf97207651bfe3a7d5ae9 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+2016-05-28  Ville Voutilainen  <ville.voutilainen@gmail.com>
+
+       Revert:
+       PR c++/69855
+       * name-lookup.c (pushdecl_maybe_friend_1): Push local function
+       decls into the global scope after stripping template bits
+       and setting DECL_ANTICIPATED.
+
 2016-05-27  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR c++/60385

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 69206816dd7fbd253ee707532523ce5630ae90c2..881470ba5c531d3a6f4b6e99d6d317b7d049028c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2016-05-28  Ville Voutilainen  <ville.voutilainen@gmail.com>
+
+       Revert:
+       PR c++/69855
+       * g++.dg/overload/69855.C: New.
+       * g++.old-deja/g++.law/missed-error2.C: Adjust.
+       * g++.old-deja/g++.pt/crash3.C: Likewise.
+
 2016-05-27  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR c++/60385