diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2014-05-12 15:33:35 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2014-05-12 15:33:35 +0000 |
| commit | bc51de9cf8fa724cb2acb81ea6d6504ac2ebbd8d (patch) | |
| tree | a5b131efad1d0c219efc9adcefd6a4b824a77db3 | |
| parent | 079f14208faf1d627da8e9873c1bc6bb1f0ef6a6 (diff) | |
| download | gcc-bc51de9cf8fa724cb2acb81ea6d6504ac2ebbd8d.zip gcc-bc51de9cf8fa724cb2acb81ea6d6504ac2ebbd8d.tar.gz gcc-bc51de9cf8fa724cb2acb81ea6d6504ac2ebbd8d.tar.bz2 | |
cvt.c (cp_convert_to_pointer): Don't call error_at if complain & tf_error is false.
2014-05-12 Paolo Carlini <paolo.carlini@oracle.com>
* cvt.c (cp_convert_to_pointer): Don't call error_at if
complain & tf_error is false.
* decl.c (make_unbound_class_template): Prefer inform for
"declared here"-type message.
From-SVN: r210326
| -rw-r--r-- | gcc/cp/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/cp/cvt.c | 5 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 5 |
3 files changed, 14 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5ddf555..a9aa613 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2014-05-12 Paolo Carlini <paolo.carlini@oracle.com> + + * cvt.c (cp_convert_to_pointer): Don't call error_at if + complain & tf_error is false. + + * decl.c (make_unbound_class_template): Prefer inform for + "declared here"-type message. + 2014-05-09 Momchil Velikov <momchil.velikov@gmail.com> PR c++/60463 diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index c833722..9b066b9 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -198,8 +198,9 @@ cp_convert_to_pointer (tree type, tree expr, tsubst_flags_t complain) complain); } } - error_at (loc, "cannot convert %qE from type %qT to type %qT", - expr, intype, type); + if (complain & tf_error) + error_at (loc, "cannot convert %qE from type %qT to type %qT", + expr, intype, type); return error_mark_node; } diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 01a3625..51df30c 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -3490,8 +3490,9 @@ make_unbound_class_template (tree context, tree name, tree parm_list, { if (complain & tf_error) { - error ("template parameters do not match template"); - error ("%q+D declared here", tmpl); + error ("template parameters do not match template %qD", tmpl); + inform (DECL_SOURCE_LOCATION (tmpl), + "%qD declared here", tmpl); } return error_mark_node; } |