It occurred to me today that I could use current_class_name rather than TYPE_IDENTIFIER (current_class_type).

Tested x86_64-pc-linux-gnu, applied to trunk.

commit d40ebc9ef2be8ab9b4d71410d9797442b2c16d9a
Author: Jason Merrill <ja...@redhat.com>
Date:   Mon May 23 15:23:42 2011 -0400

    	* pt.c (tsubst_copy_and_build): Use current_class_name.

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 4299733..dbff91e 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 "

Reply via email to