aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog8
-rw-r--r--gcc/testsuite/ChangeLog8
2 files changed, 16 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index cdc2f5a..44022e7 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 6920681..881470b 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