* pt.c (tsubst_copy_and_build): Use current_class_name.

From-SVN: r174102

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c00e0649f1497c8a161b20f251a987303afbee3d..ee2c9d9ecd246412ca0e42e1b61cc7bae53768ae 100644 (file)
--- 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 429973302c761ff69b911dfb560b289ac158321c..dbff91e617dae39ad91fb36c2f8dd349b1c9aeab 100644 (file)
--- 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 "