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 1fdd09216c26b02990248e36fbe7dd7f70d7c63e..712e118500e9640f96b9d93b57da06891e3593a1 100644 (file)
--- 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 57455d2fcd3178054b536a6c6e3e8814c77a34dd..4f6f982237b8450551b994d2dd30b4641330554f 100644 (file)
--- 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 3b70743c32cb78f64dc36d8323d64d7a4cfdbe42..d1927f1890a2e14730721790524a78528504002a 100644 (file)
--- 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 ();