diff options
| author | Jason Merrill <jason@casey.cygnus.com> | 2000-04-20 05:53:58 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2000-04-20 01:53:58 -0400 |
| commit | 6e9dcc25c1b16f9d2b3cb0f991f2840b0a4385e8 (patch) | |
| tree | 5c00cfe370fd1a8509cf66030a91d8fa23d2eb8c /gcc/cp/call.c | |
| parent | af98124ef9a698e8b82e4e794fd421ea0ccb3054 (diff) | |
| download | gcc-6e9dcc25c1b16f9d2b3cb0f991f2840b0a4385e8.zip gcc-6e9dcc25c1b16f9d2b3cb0f991f2840b0a4385e8.tar.gz gcc-6e9dcc25c1b16f9d2b3cb0f991f2840b0a4385e8.tar.bz2 | |
typeck.c (build_x_function_call): Resolve an OFFSET_REF.
* typeck.c (build_x_function_call): Resolve an OFFSET_REF.
* call.c (joust): Exit early if we get the same function, too.
* decl2.c (key_method): Return NULL_TREE for template classes.
(import_export_class): Don't need to check for template classes.
From-SVN: r33273
Diffstat (limited to 'gcc/cp/call.c')
| -rw-r--r-- | gcc/cp/call.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 1ffbf60..085e264 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -4923,8 +4923,9 @@ joust (cand1, cand2, warn) return -1; /* If we have two pseudo-candidates for conversions to the same type, - arbitrarily pick one. */ - if (TYPE_P (cand1->fn) && cand1->fn == cand2->fn) + or two candidates for the same function, arbitrarily pick one. */ + if (cand1->fn == cand2->fn + && (TYPE_P (cand1->fn) || DECL_P (cand1->fn))) return 1; /* a viable function F1 |