diff options
| author | Jason Merrill <jason@yorick.cygnus.com> | 1997-11-20 04:43:53 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1997-11-19 23:43:53 -0500 |
| commit | f2d773a2fdf45e585ab7cfd81cdf5c081dc91c24 (patch) | |
| tree | 45baafd355ca0dddf963ba8c0bb6d3fb2f691c1d /gcc | |
| parent | 5951f637bc7086189b9702766068fb5f319039ad (diff) | |
| download | gcc-f2d773a2fdf45e585ab7cfd81cdf5c081dc91c24.zip gcc-f2d773a2fdf45e585ab7cfd81cdf5c081dc91c24.tar.gz gcc-f2d773a2fdf45e585ab7cfd81cdf5c081dc91c24.tar.bz2 | |
decl.c (start_decl): Don't just complain about a mismatched scope, fix it.
* decl.c (start_decl): Don't just complain about a mismatched
scope, fix it.
From-SVN: r16591
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f10aea4a..b123b92 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ Wed Nov 19 18:24:14 1997 Jason Merrill <jason@yorick.cygnus.com> + * decl.c (start_decl): Don't just complain about a mismatched + scope, fix it. + * decl.c (make_implicit_typename): Handle case where t is not actually from context. * tree.c (get_type_decl): Lose identifier case. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 3aa8201..5cda56a 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -6009,7 +6009,12 @@ start_decl (declarator, declspecs, initialized) else { if (DECL_CONTEXT (field) != context) - cp_pedwarn ("ANSI C++ does not permit `%T::%D' to be defined as `%T::%D'", DECL_CONTEXT (field), DECL_NAME (decl), context, DECL_NAME (decl)); + { + cp_pedwarn ("ANSI C++ does not permit `%T::%D' to be defined as `%T::%D'", + DECL_CONTEXT (field), DECL_NAME (decl), + context, DECL_NAME (decl)); + DECL_CONTEXT (decl) = DECL_CONTEXT (field); + } if (duplicate_decls (decl, field)) decl = field; } |