From: Ville Voutilainen <ville@gcc.gnu.org>
Date: Sat, 28 May 2016 16:21:05 +0000 (+0300)
Subject: Update changelogs for revert of c++/69855.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c8419aca08b9262c3d4ffe498fd8fac2ee5992c9;p=gcc.git

Update changelogs for revert of c++/69855.

From-SVN: r236850
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index cdc2f5a46fd..44022e781e7 100644
--- 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 69206816dd7..881470ba5c5 100644
--- 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