typeck.c (build_const_cast): Tweak last change to handle templates correctly.

* typeck.c (build_const_cast): Tweak last change to handle
	templates correctly.

From-SVN: r26712
This commit is contained in:
Mark Mitchell 1999-04-30 16:07:03 +00:00 committed by Mark Mitchell
parent b694131f21
commit 3fd91cbd4f
3 changed files with 18 additions and 8 deletions

View File

@ -1,5 +1,8 @@
1999-04-30 Mark Mitchell <mark@codesourcery.com>
* typeck.c (build_const_cast): Tweak last change to handle
templates correctly.
* typeck.c (build_const_cast): Disallow use of const_cast to
anything but a pointer or reference type.

View File

@ -5633,14 +5633,6 @@ build_const_cast (type, expr)
if (type == error_mark_node || expr == error_mark_node)
return error_mark_node;
if (!POINTER_TYPE_P (type) && !TYPE_PTRMEMFUNC_P (type))
{
cp_error ("`%T' is not a pointer, reference, or pointer-to-member type",
type);
cp_error ("as required by const_cast");
return error_mark_node;
}
if (TREE_CODE (expr) == OFFSET_REF)
expr = resolve_offset_ref (expr);
@ -5651,6 +5643,14 @@ build_const_cast (type, expr)
return t;
}
if (!POINTER_TYPE_P (type) && !TYPE_PTRMEMFUNC_P (type))
{
cp_error ("`%T' is not a pointer, reference, or pointer-to-member type",
type);
cp_error ("as required by const_cast");
return error_mark_node;
}
if (TREE_CODE (type) != REFERENCE_TYPE)
{
expr = decay_conversion (expr);

View File

@ -0,0 +1,7 @@
// Build don't link:
// Origin: Mark Mitchell <mark@codesourcery.com>
template <class T>
void f (T t) {
const_cast<T>(t);
}