+2010-02-17 Jason Merrill <jason@redhat.com>
+
+ PR c++/43079
+ * pt.c (convert_nontype_argument): Change assert to test.
+
2010-02-16 Jason Merrill <jason@redhat.com>
* cp-gimplify.c (cp_gimplify_expr): Fix error recovery.
provide a superior diagnostic. */
if (!same_type_p (TREE_TYPE (expr), type))
{
- /* Make sure we are just one standard conversion off. */
- gcc_assert (can_convert (type, TREE_TYPE (expr)));
error ("%qE is not a valid template argument for type %qT "
"because it is of type %qT", expr, type,
TREE_TYPE (expr));
- inform (input_location, "standard conversions are not allowed in this context");
+ /* If we are just one standard conversion off, explain. */
+ if (can_convert (type, TREE_TYPE (expr)))
+ inform (input_location,
+ "standard conversions are not allowed in this context");
return NULL_TREE;
}
}