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

gcc/cp/ChangeLog

+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.

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)
 	{

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 ();