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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5b03f596b62c51689eed1aac133d86b262da17b5..ad66b7ce93079ea22c5f4b575728ddbd4b6afa6a 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -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

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 5acf62206497415ec6739d092a4978bf3fe0b332..af9de43c559a4b85cef84581d7acd99d9bf93795 100644 (file)
--- 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);
        }