diff options
| author | giovannibajo <giovannibajo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-12-02 15:46:51 +0000 |
|---|---|---|
| committer | giovannibajo <giovannibajo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-12-02 15:46:51 +0000 |
| commit | 2d1f8ee939e88029ead0bedaae10e1d0d2402dc1 (patch) | |
| tree | 4b7c605801913d140a9e47110a4f04cd8d62421f | |
| parent | be1ed945df17d43a676f35b3708b1d76f6306834 (diff) | |
| download | ppe42-gcc-2d1f8ee939e88029ead0bedaae10e1d0d2402dc1.tar.gz ppe42-gcc-2d1f8ee939e88029ead0bedaae10e1d0d2402dc1.zip | |
PR c++/10126
* pt.c (convert_nontype_argument): Handle default conversions
while converting a pointer to member function.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74184 138bc75d-0d04-0410-961f-82ee72b054a4
| -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 972396880d0..7b7f63a6650 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 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; |
