diff options
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 5b03f596b62..ad66b7ce930 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 5acf6220649..af9de43c559 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); } |
