OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Nathan Sidwell 2001-06-08 13:49:09 +00:00 committed by Nathan Sidwell
parent 9ac1bd2e0a
commit 06d5e6330f
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
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

8
gcc/cp/decl.c
View File

@ -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);
}