diff options
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/cp/ChangeLog | 8 | ||||
-rw-r--r-- | gcc/cp/decl.c | 3 | ||||
-rw-r--r-- | gcc/cp/decl2.c | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8fb2e88..d1d0d1c 100644 --- 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 24dbfd1..e17b6f7 100644 --- 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 1039747..2608343 100644 --- 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); |