diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-09-21 21:47:55 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-09-21 21:47:55 +0000 |
| commit | 835bbc7878592f4352ccdfe0d43bc151f9b223c1 (patch) | |
| tree | 9385a01cdf592a6f9f7e49d59e5c371f646f127d | |
| parent | eabb26f3109dd5e9f23b3d1e86e675c9db5a881e (diff) | |
| download | ppe42-gcc-835bbc7878592f4352ccdfe0d43bc151f9b223c1.tar.gz ppe42-gcc-835bbc7878592f4352ccdfe0d43bc151f9b223c1.zip | |
* decl2.c (get_guard): Check DECL_FUNCTION_SCOPE_P.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36566 138bc75d-0d04-0410-961f-82ee72b054a4
| -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 222b0158f8d..c56941336d8 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 a530c3284ee..a9dc4132fa3 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); |
