diff options
| author | Jason Merrill <jason@redhat.com> | 2000-09-21 17:47:55 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2000-09-21 17:47:55 -0400 |
| commit | 99fada40ffa1fb0b899e7a636a993006165b8803 (patch) | |
| tree | 9385a01cdf592a6f9f7e49d59e5c371f646f127d /gcc/cp | |
| parent | 1bfb5f8f9695ed1166362e3a508a2f3d9c7b0238 (diff) | |
| download | gcc-99fada40ffa1fb0b899e7a636a993006165b8803.zip gcc-99fada40ffa1fb0b899e7a636a993006165b8803.tar.gz gcc-99fada40ffa1fb0b899e7a636a993006165b8803.tar.bz2 | |
* decl2.c (get_guard): Check DECL_FUNCTION_SCOPE_P.
From-SVN: r36566
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 222b015..c569413 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2000-09-20 Jason Merrill <jason@redhat.com> + + * decl2.c (get_guard): Check DECL_FUNCTION_SCOPE_P. + 2000-09-21 Andreas Jaeger <aj@suse.de> * errfn.c: Move declaration of cp_printer and cp_printers to ... diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index a530c32..a9dc413 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -2868,7 +2868,7 @@ get_guard (decl) /* For a local variable, under the old ABI, we do not try to get a unique mangled name for the DECL. */ - if (!flag_new_abi && !DECL_NAMESPACE_SCOPE_P (decl)) + if (!flag_new_abi && DECL_FUNCTION_SCOPE_P (decl)) { guard = get_temp_name (integer_type_node); cp_finish_decl (guard, NULL_TREE, NULL_TREE, 0); |