From 59e7a90194128726d24c8637c92f445b8b424e33 Mon Sep 17 00:00:00 2001 From: Giovanni Bajo Date: Tue, 2 Dec 2003 15:46:51 +0000 Subject: [PATCH] re PR c++/10126 (ICE in convert_nontype_argument on using overload resolution in template args) PR c++/10126 * pt.c (convert_nontype_argument): Handle default conversions while converting a pointer to member function. From-SVN: r74184 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/pt.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 972396880d0..7b7f63a6650 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2003-12-02 Giovanni Bajo + + PR c++/10126 + * pt.c (convert_nontype_argument): Handle default conversions + while converting a pointer to member function. + 2003-12-02 Giovanni Bajo PR c++/12573 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 93d790bc818..33c2589fdf1 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -3440,8 +3440,9 @@ convert_nontype_argument (tree type, tree expr) if (expr == error_mark_node) return error_mark_node; - my_friendly_assert (same_type_p (type, TREE_TYPE (expr)), - 0); + if (!same_type_p (type, TREE_TYPE (expr))) + return error_mark_node; + return expr; } break; -- 2.30.2