diff options
| author | jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-09-29 20:27:26 +0000 |
|---|---|---|
| committer | jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-09-29 20:27:26 +0000 |
| commit | df4d0ece4fe5366ed0261b32b6e5cdb2dc8252fc (patch) | |
| tree | 4d6af7bfab6a91d602bda4e9a23e6b7fcfeac89c /gcc/cp | |
| parent | 9cf6cf1c1297de7fad44b084ec539909b3cbabd1 (diff) | |
| download | gcc-df4d0ece4fe5366ed0261b32b6e5cdb2dc8252fc.tar.gz | |
PR c/7425
* c-decl.c (merge_decls): Merge TREE_DEPRECATED.
cp:
* decl.c (duplicate_decls): Merge TREE_DEPRECATED.
testsuite:
* gcc.dg/deprecated-3.c, g++.dg/warn/deprecated-2.C: New tests.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@88303 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4933e07af12..fa42fad9a43 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2004-09-29 Joseph S. Myers <jsm@polyomino.org.uk> + + * decl.c (duplicate_decls): Merge TREE_DEPRECATED. + 2004-09-29 Jason Merrill <jason@redhat.com> PR tree-optimization/17697 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 3e394ab43e8..c27d041378b 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -1722,6 +1722,10 @@ duplicate_decls (tree newdecl, tree olddecl) if (TREE_NOTHROW (newdecl)) TREE_NOTHROW (olddecl) = 1; + /* Merge deprecatedness. */ + if (TREE_DEPRECATED (newdecl)) + TREE_DEPRECATED (olddecl) = 1; + /* Merge the initialization information. */ if (DECL_INITIAL (newdecl) == NULL_TREE && DECL_INITIAL (olddecl) != NULL_TREE) |