diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9723968..7b7f63a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,11 @@ 2003-12-02 Giovanni Bajo <giovannibajo@gcc.gnu.org> + PR c++/10126
+ * pt.c (convert_nontype_argument): Handle default conversions
+ while converting a pointer to member function.
+ +2003-12-02 Giovanni Bajo <giovannibajo@gcc.gnu.org> + PR c++/12573
* pt.c (value_dependent_expression_p): Handle COMPONENT_REFs by
looking into them recursively.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 93d790b..33c2589 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; |