diff options
author | Jason Merrill <jason@redhat.com> | 2011-05-23 23:49:12 -0400 |
---|---|---|
committer | Jason Merrill <jason@gcc.gnu.org> | 2011-05-23 23:49:12 -0400 |
commit | 74424c737af660ad50385a3ab01c192acfd37e56 (patch) | |
tree | 72c28416bd239a05d4d317b53d3e091adf2139df /gcc | |
parent | 874aeeede55641e963f98fa663653aafa2a16d87 (diff) | |
download | gcc-74424c737af660ad50385a3ab01c192acfd37e56.zip gcc-74424c737af660ad50385a3ab01c192acfd37e56.tar.gz gcc-74424c737af660ad50385a3ab01c192acfd37e56.tar.bz2 |
* pt.c (tsubst_copy_and_build): Use current_class_name.
From-SVN: r174102
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/cp/ChangeLog | 2 | ||||
-rw-r--r-- | gcc/cp/pt.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c00e064..ee2c9d9 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 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 " |