diff options
| author | Jason Merrill <jason@gcc.gnu.org> | 1997-10-08 00:26:17 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1997-10-08 00:26:17 -0400 |
| commit | a6f025879ba98efb5a0fc222e6d279b26dcdf216 (patch) | |
| tree | 3c298c5764455cc640a32a7549add010e8d3d43a | |
| parent | 7e9e3823c77c2d5ee9a160cb6f36c03eec67ee1a (diff) | |
| download | gcc-a6f025879ba98efb5a0fc222e6d279b26dcdf216.zip gcc-a6f025879ba98efb5a0fc222e6d279b26dcdf216.tar.gz gcc-a6f025879ba98efb5a0fc222e6d279b26dcdf216.tar.bz2 | |
method.c (build_static_name): Fix typo.
* method.c (build_static_name): Fix typo.
1997-10-07 Brendan Kehoe <brendan@lisa.cygnus.com>
* decl.c (duplicate_decls): Make sure DECL_LANG_SPECIFIC is set on
OLDDECL before we try to do DECL_USE_TEMPLATE.
From-SVN: r15873
| -rw-r--r-- | gcc/cp/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 2 | ||||
| -rw-r--r-- | gcc/cp/method.c | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 1fdd092..712e118 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,12 @@ +Tue Oct 7 21:11:22 1997 Jason Merrill <jason@yorick.cygnus.com> + + * method.c (build_static_name): Fix typo. + +1997-10-07 Brendan Kehoe <brendan@lisa.cygnus.com> + + * decl.c (duplicate_decls): Make sure DECL_LANG_SPECIFIC is set on + OLDDECL before we try to do DECL_USE_TEMPLATE. + Tue Oct 7 00:48:36 1997 Jason Merrill <jason@yorick.cygnus.com> * decl.c (duplicate_decls): Don't warn about template instances. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 57455d2..4f6f982 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -2623,7 +2623,7 @@ duplicate_decls (newdecl, olddecl) } } - if (DECL_USE_TEMPLATE (olddecl)) + if (DECL_LANG_SPECIFIC (olddecl) && DECL_USE_TEMPLATE (olddecl)) ; else if (TREE_CODE (olddecl) == FUNCTION_DECL) { diff --git a/gcc/cp/method.c b/gcc/cp/method.c index 3b70743..d1927f1 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -1095,7 +1095,7 @@ build_static_name (context, name) #else OB_PUTS ("__static_"); build_qualified_name (context); - OB_PUTC (' '); + OB_PUTC ('_'); #endif OB_PUTID (name); OB_FINISH (); |