aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorPaolo Carlini <paolo@gcc.gnu.org>2015-04-02 15:23:36 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2015-04-02 15:23:36 +0000
commitc23a9ec5f41faeb5f1996cb0ef902c01d0015149 (patch)
tree7efadd5ede2f0d66fe386fabbf268db1b2503fa2 /gcc/cp
parent287044d97216beeb8784acb9a916522cc882e9f2 (diff)
downloadgcc-c23a9ec5f41faeb5f1996cb0ef902c01d0015149.zip
gcc-c23a9ec5f41faeb5f1996cb0ef902c01d0015149.tar.gz
gcc-c23a9ec5f41faeb5f1996cb0ef902c01d0015149.tar.bz2
2015-04-02 Paolo Carlini <paolo.carlini@oracle.com>
Complete commit. From-SVN: r221841
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 904c920..d3dbd67 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2015-04-01 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR c++/56100
+ * pt.c (instantiating_current_function_p): New.
+ * name-lookup.c (pushdecl_maybe_friend_1): Use it.
+ * cp-tree.h (instantiating_current_function_p): Declare.
+
2015-04-01 Jason Merrill <jason@redhat.com>
PR c++/65646