summaryrefslogtreecommitdiff
path: root/gcc/cp/cvt.c
diff options
context:
space:
mode:
authormrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4>1995-03-24 22:18:53 +0000
committermrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4>1995-03-24 22:18:53 +0000
commitdd2b9e1788ba5747f681f3af02edb335ec613035 (patch)
tree2ac93d9dc0099266297ee6a1f0175f9dcebc731b /gcc/cp/cvt.c
parentfe57b5bfbb1aa201833b02f4ddfdd8d7c3701d6d (diff)
downloadgcc-dd2b9e1788ba5747f681f3af02edb335ec613035.tar.gz
60th Cygnus<->FSF merge
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@9230 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/cvt.c')
-rw-r--r--gcc/cp/cvt.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index 7e880b44b99..89f59149ab5 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -1560,10 +1560,13 @@ build_type_conversion (code, xtype, expr, for_sure)
{
if (winner)
{
- cp_error ("ambiguous conversion from `%T' to `%T'", basetype,
- xtype);
- cp_error (" candidate conversions include `%T' and `%T'",
- TREE_VALUE (winner), TREE_VALUE (conv));
+ if (for_sure)
+ {
+ cp_error ("ambiguous conversion from `%T' to `%T'", basetype,
+ xtype);
+ cp_error (" candidate conversions include `%T' and `%T'",
+ TREE_VALUE (winner), TREE_VALUE (conv));
+ }
return NULL_TREE;
}
else