diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2001-06-08 13:49:09 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2001-06-08 13:49:09 +0000 |
| commit | 06d5e6330fb628e337fd0485bb5d377a3c4f3d1c (patch) | |
| tree | ead238883e47e22fe9a5a5adfad88bcfa7809650 /gcc | |
| parent | 9ac1bd2e0ab404e3aa6f8e562f2f1f39f1fcb8de (diff) | |
| download | gcc-06d5e6330fb628e337fd0485bb5d377a3c4f3d1c.zip gcc-06d5e6330fb628e337fd0485bb5d377a3c4f3d1c.tar.gz gcc-06d5e6330fb628e337fd0485bb5d377a3c4f3d1c.tar.bz2 | |
decl.c (duplicate_decls): Fix DECL_TEMPLATE_RESULT thinko in previous change.
* decl.c (duplicate_decls): Fix DECL_TEMPLATE_RESULT thinko
in previous change.
From-SVN: r43014
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5b03f59..ad66b7c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,10 @@ 2001-06-08 Nathan Sidwell <nathan@codesourcery.com> + * decl.c (duplicate_decls): Fix DECL_TEMPLATE_RESULT thinko + in previous change. + +2001-06-08 Nathan Sidwell <nathan@codesourcery.com> + PR c++/2929 * friend.c (do_friend): Use push_decl_namespace for classes at namespace scope. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 5acf622..af9de43 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -3501,14 +3501,14 @@ duplicate_decls (newdecl, olddecl) /* If the new declaration is a definition, update the file and line information on the declaration. */ - if (DECL_INITIAL (DECL_RESULT (olddecl)) == NULL_TREE - && DECL_INITIAL (DECL_RESULT (newdecl)) != NULL_TREE) + if (DECL_INITIAL (DECL_TEMPLATE_RESULT (olddecl)) == NULL_TREE + && DECL_INITIAL (DECL_TEMPLATE_RESULT (newdecl)) != NULL_TREE) { DECL_SOURCE_LINE (olddecl) - = DECL_SOURCE_LINE (DECL_RESULT (olddecl)) + = DECL_SOURCE_LINE (DECL_TEMPLATE_RESULT (olddecl)) = DECL_SOURCE_LINE (newdecl); DECL_SOURCE_FILE (olddecl) - = DECL_SOURCE_FILE (DECL_RESULT (olddecl)) + = DECL_SOURCE_FILE (DECL_TEMPLATE_RESULT (olddecl)) = DECL_SOURCE_FILE (newdecl); } |