From 06d5e6330fb628e337fd0485bb5d377a3c4f3d1c Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Fri, 8 Jun 2001 13:49:09 +0000 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 5 +++++ 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,3 +1,8 @@ +2001-06-08 Nathan Sidwell + + * decl.c (duplicate_decls): Fix DECL_TEMPLATE_RESULT thinko + in previous change. + 2001-06-08 Nathan Sidwell PR c++/2929 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); } -- 2.30.2