decl.c (pushdecl): Remove dead code.

	* decl.c (pushdecl): Remove dead code.
	* decl2.c (finish_objects): Fix code I missed in previous change.

From-SVN: r25242

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8fb2e889d0eef41d11c21e5f42afa9acd8d3f559..d1d0d1ca504e26705950409f567924bdca7f4829 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+1999-02-16  Kriang Lerdsuwanakij <lerdsuwa@scf-fs.usc.edu>
+
+       * decl.c (pushdecl): Remove dead code.
+
+1999-02-16  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * decl2.c (finish_objects): Fix code I missed in previous change.
+
 1999-02-13  Jason Merrill  <jason@yorick.cygnus.com>
 
        * decl.c (grokfndecl): Return NULL_TREE instead of error_mark_node.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 24dbfd108ebdb4dcc327aacec7baefcd4c91e449..e17b6f7222f1d067b9d98e5a4b4529bffbc5cc95 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -3554,8 +3554,7 @@ pushdecl (x)
   /* Type are looked up using the DECL_NAME, as that is what the rest of the
      compiler wants to use.  */
   if (TREE_CODE (x) == TYPE_DECL || TREE_CODE (x) == VAR_DECL
-      || TREE_CODE (x) == NAMESPACE_DECL || TREE_CODE (x) == TEMPLATE_TYPE_PARM
-      || TREE_CODE (x) == TEMPLATE_TEMPLATE_PARM)
+      || TREE_CODE (x) == NAMESPACE_DECL)
     name = DECL_NAME (x);
 
   if (name)

diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 103974718dbf02bec5c162c928f9ffbd128192ce..260834377d9eaeaf8443ef11e968945af4d97ad1 100644 (file)
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -2963,7 +2963,7 @@ finish_objects (method_type, initp)
 {
   char *fnname;
 
-  if (! initp)
+  if (initp == DEFAULT_INIT_PRIORITY)
     {
       tree list = (method_type == 'I' ? static_ctors : static_dtors);