diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 2 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 57d129a..7955e4c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,7 @@ 1998-12-15 Mark Mitchell <mark@markmitchell.com> + * decl.c (poplevel): Make sure ns_binding is initialized. + * decl.c (finish_function): Undo inadvertant change in previous patch. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 81fa59f..356293a 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -1365,7 +1365,9 @@ poplevel (keep, reverse, functionbody) if (!outer_binding) ns_binding = IDENTIFIER_NAMESPACE_VALUE (DECL_NAME (link)); - + else + ns_binding = NULL_TREE; + if (outer_binding && (BINDING_LEVEL (outer_binding) == current_binding_level->level_chain)) |