Commit 06d5e633 by Nathan Sidwell Committed by Nathan Sidwell

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
parent 9ac1bd2e
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.
......
......@@ -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);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment