From 0a73e37f4f131d0581df2b6b6df19b03d6903ee2 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Mon, 28 Jun 2004 07:39:08 +0000 Subject: [PATCH] * parser.c (cp_parser_set_decl_spec_type): Fix thinko. From-SVN: r83764 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/parser.c | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index aaf1956488e..756bc919d02 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2004-06-28 Mark Mitchell + + * parser.c (cp_parser_set_decl_spec_type): Fix thinko. + 2004-06-27 Gabriel Dos Reis PR c++/14123 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 174c56a5e1d..56605de72de 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -15439,13 +15439,21 @@ cp_parser_set_decl_spec_type (cp_decl_specifier_seq *decl_specs, || decl_specs->specs[(int) ds_short] || decl_specs->specs[(int) ds_unsigned] || decl_specs->specs[(int) ds_signed])) - decl_specs->redefined_builtin_type = type_spec; + { + decl_specs->redefined_builtin_type = type_spec; + if (!decl_specs->type) + { + decl_specs->type = type_spec; + decl_specs->user_defined_type_p = false; + } + } else if (decl_specs->type) decl_specs->multiple_types_p = true; else { decl_specs->type = type_spec; decl_specs->user_defined_type_p = user_defined_p; + decl_specs->redefined_builtin_type = NULL_TREE; } } -- 2.30.2