diff options
| author | Jason Merrill <jason@redhat.com> | 2012-07-25 10:56:41 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2012-07-25 10:56:41 -0400 |
| commit | 25a92d2f912c6b5a486bd7625d7e363617e20627 (patch) | |
| tree | 8e7ee7081f67f113e40ba36f56c22fbb89241590 /gcc/cp | |
| parent | 229ecb89356fe16fac2bf2a90f47e8c9325898b1 (diff) | |
| download | gcc-25a92d2f912c6b5a486bd7625d7e363617e20627.zip gcc-25a92d2f912c6b5a486bd7625d7e363617e20627.tar.gz gcc-25a92d2f912c6b5a486bd7625d7e363617e20627.tar.bz2 | |
* pt.c (print_candidates_1): Use inform instead of error.
From-SVN: r189849
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5dd4031..e9c6cff 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2012-07-25 Jason Merrill <jason@redhat.com> + + * pt.c (print_candidates_1): Use inform instead of error. + 2012-07-24 Paolo Carlini <paolo.carlini@oracle.com> * pt.c (convert_template_argument, tsubst): Simplify fourth argument diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 532189d..07b294f 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -1718,19 +1718,21 @@ print_candidates_1 (tree fns, bool more, const char **str) } else { + tree cand = OVL_CURRENT (fn); if (!*str) { /* Pick the prefix string. */ if (!more && !OVL_NEXT (fns)) { - error ("candidate is: %+#D", OVL_CURRENT (fn)); + inform (DECL_SOURCE_LOCATION (cand), + "candidate is: %#D", cand); continue; } *str = _("candidates are:"); spaces = get_spaces (*str); } - error ("%s %+#D", *str, OVL_CURRENT (fn)); + inform (DECL_SOURCE_LOCATION (cand), "%s %#D", *str, cand); *str = spaces ? spaces : *str; } |