From: Jason Merrill <jason@gcc.gnu.org>
Date: Wed, 8 Oct 1997 04:26:17 +0000 (-0400)
Subject: method.c (build_static_name): Fix typo.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a6f025879ba98efb5a0fc222e6d279b26dcdf216;p=gcc.git

method.c (build_static_name): Fix typo.

	* method.c (build_static_name): Fix typo.

1997-10-07  Brendan Kehoe  <brendan@lisa.cygnus.com>

	* decl.c (duplicate_decls): Make sure DECL_LANG_SPECIFIC is set on
	OLDDECL before we try to do DECL_USE_TEMPLATE.

From-SVN: r15873
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1fdd09216c2..712e118500e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+Tue Oct  7 21:11:22 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* method.c (build_static_name): Fix typo.
+
+1997-10-07  Brendan Kehoe  <brendan@lisa.cygnus.com>
+
+	* decl.c (duplicate_decls): Make sure DECL_LANG_SPECIFIC is set on
+	OLDDECL before we try to do DECL_USE_TEMPLATE.
+
 Tue Oct  7 00:48:36 1997  Jason Merrill  <jason@yorick.cygnus.com>
 
 	* decl.c (duplicate_decls): Don't warn about template instances.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 57455d2fcd3..4f6f982237b 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -2623,7 +2623,7 @@ duplicate_decls (newdecl, olddecl)
 	    }
 	}
 
-      if (DECL_USE_TEMPLATE (olddecl))
+      if (DECL_LANG_SPECIFIC (olddecl) && DECL_USE_TEMPLATE (olddecl))
 	;
       else if (TREE_CODE (olddecl) == FUNCTION_DECL)
 	{
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 3b70743c32c..d1927f1890a 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -1095,7 +1095,7 @@ build_static_name (context, name)
 #else
   OB_PUTS ("__static_");
   build_qualified_name (context);
-  OB_PUTC (' ');
+  OB_PUTC ('_');
 #endif
   OB_PUTID (name);
   OB_FINISH ();