diff options
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ff63da14f45..f6982704c2e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2004-07-06 Giovanni Bajo <giovannibajo@gcc.gnu.org> + + PR c++/3671 + * pt.c (convert_nontype_argument): Disallow conversions between + different enumeration types. + 2004-07-06 Nathan Sidwell <nathan@codesourcery.com> * cp-tree.h (BINFO_MARKED): Remove. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 9ecec9878de..0a43edead93 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -3323,7 +3323,14 @@ convert_nontype_argument (tree type, tree expr) conversions (_conv.integral_) are applied. */ if (!INTEGRAL_TYPE_P (expr_type)) return error_mark_node; - + + /* [conv.integral] does not allow conversions between two different + enumeration types. */ + if (TREE_CODE (type) == ENUMERAL_TYPE + && TREE_CODE (expr_type) == ENUMERAL_TYPE + && !same_type_ignoring_top_level_qualifiers_p (type, expr_type)) + return error_mark_node; + /* It's safe to call digest_init in this case; we know we're just converting one integral constant expression to another. */ expr = digest_init (type, expr, (tree*) 0); |