From: Jason Merrill <jason@redhat.com>
Date: Tue, 24 May 2011 03:49:12 +0000 (-0400)
Subject: * pt.c (tsubst_copy_and_build): Use current_class_name.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=74424c737af660ad50385a3ab01c192acfd37e56;p=gcc.git

* pt.c (tsubst_copy_and_build): Use current_class_name.

From-SVN: r174102
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c00e0649f14..ee2c9d9ecd2 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,7 @@
 2011-05-23  Jason Merrill  <jason@redhat.com>
 
+	* pt.c (tsubst_copy_and_build): Use current_class_name.
+
 	PR c++/49102
 	* call.c (convert_arg_to_ellipsis): Call force_rvalue.
 
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 429973302c7..dbff91e617d 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -13017,8 +13017,7 @@ tsubst_copy_and_build (tree t,
 			else
 			  inform (EXPR_LOC_OR_HERE (t),
 				  "use %<%T::%D%> instead",
-				  TYPE_IDENTIFIER (current_class_type),
-				  function);
+				  current_class_name, function);
 		      }
 		    else
 		      inform (0, "%q+D declared here, later in the "