From c23a9ec5f41faeb5f1996cb0ef902c01d0015149 Mon Sep 17 00:00:00 2001
From: Paolo Carlini <paolo@gcc.gnu.org>
Date: Thu, 2 Apr 2015 15:23:36 +0000
Subject: [PATCH] 2015-04-02  Paolo Carlini  <paolo.carlini@oracle.com>

	Complete commit.

From-SVN: r221841
---
 gcc/cp/ChangeLog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 904c9206590..d3dbd671ed1 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
-- 
2.30.2