diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2003-07-27 16:51:14 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2003-07-27 16:51:14 +0000 |
| commit | c67d36d0d71914f0b74f2962f9dbf9844cbd02e8 (patch) | |
| tree | 3b7cf8b87ccdf2b785ad5e2ce88efc2427f5ce53 | |
| parent | cc33095ccf077e836c7b061ed260ddd24375e708 (diff) | |
| download | gcc-c67d36d0d71914f0b74f2962f9dbf9844cbd02e8.tar.gz | |
parser.c (cp_parser_type_parameter): Reformat.
* parser.c (cp_parser_type_parameter): Reformat.
(cp_parser_parameter_declaration): Deprecate default args where
not allowed.
From-SVN: r69852
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 16 |
2 files changed, 15 insertions, 7 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4ac3accc00b..ad86f1aa5e0 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2003-07-27 Nathan Sidwell <nathan@codesourcery.com> + + * parser.c (cp_parser_type_parameter): Reformat. + (cp_parser_parameter_declaration): Deprecate default args where + not allowed. + 2003-07-26 Nathan Sidwell <nathan@codesourcery.com> * cfns.h: Rebuilt. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 5a7dc875bb9..003b4fe8739 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -7305,8 +7305,7 @@ cp_parser_type_parameter (cp_parser* parser) /* Create the combined representation of the parameter and the default argument. */ - parameter = build_tree_list (default_argument, - parameter); + parameter = build_tree_list (default_argument, parameter); } break; @@ -7365,8 +7364,7 @@ cp_parser_type_parameter (cp_parser* parser) /* Create the combined representation of the parameter and the default argument. */ - parameter = build_tree_list (default_argument, - parameter); + parameter = build_tree_list (default_argument, parameter); } break; @@ -10498,9 +10496,13 @@ cp_parser_parameter_declaration (cp_parser *parser, } if (!parser->default_arg_ok_p) { - pedwarn ("default arguments are only permitted on functions"); - if (flag_pedantic_errors) - default_argument = NULL_TREE; + if (!flag_pedantic_errors) + warning ("deprecated use of default argument for parameter of non-function"); + else + { + error ("default arguments are only permitted for function parameters"); + default_argument = NULL_TREE; + } } } else |