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

 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.

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;