diff options
| author | kan <kan@FreeBSD.org> | 2006-08-26 21:29:10 +0000 |
|---|---|---|
| committer | kan <kan@FreeBSD.org> | 2006-08-26 21:29:10 +0000 |
| commit | ab6c6e434e4ca0bf593007d49dee6eceb73286c0 (patch) | |
| tree | 843ffc6140f66bf60562adb1bf8d3d82b9739b5e /contrib/gcc/cp/init.c | |
| parent | 8a6911d2bb988a943624cbf4e4041b827d9ade53 (diff) | |
| download | FreeBSD-src-ab6c6e434e4ca0bf593007d49dee6eceb73286c0.zip FreeBSD-src-ab6c6e434e4ca0bf593007d49dee6eceb73286c0.tar.gz | |
Gcc 3.4.6 as of 2006/08/25 #116475.
Diffstat (limited to 'contrib/gcc/cp/init.c')
| -rw-r--r-- | contrib/gcc/cp/init.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/contrib/gcc/cp/init.c b/contrib/gcc/cp/init.c index 732d4a0..4e3cd4b 100644 --- a/contrib/gcc/cp/init.c +++ b/contrib/gcc/cp/init.c @@ -1015,11 +1015,11 @@ expand_member_init (tree name) if (!direct_binfo && !virtual_binfo) { if (TYPE_USES_VIRTUAL_BASECLASSES (current_class_type)) - error ("type `%D' is not a direct or virtual base of `%T'", - name, current_class_type); + error ("type `%T' is not a direct or virtual base of `%T'", + basetype, current_class_type); else - error ("type `%D' is not a direct base of `%T'", - name, current_class_type); + error ("type `%T' is not a direct base of `%T'", + basetype, current_class_type); return NULL_TREE; } @@ -2075,9 +2075,6 @@ build_new_1 (tree exp) fns = lookup_fnfields (true_type, fnname, /*protect=*/2); if (!fns) { - /* See PR 15967. This should never happen (and it is - fixed correctly in mainline), but on the release branch - we prefer this less-intrusive approacch. */ error ("no suitable or ambiguous `%D' found in class `%T'", fnname, true_type); return error_mark_node; |
