diff options
| author | Jason Merrill <jason@redhat.com> | 2010-06-15 15:58:54 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2010-06-15 15:58:54 -0400 |
| commit | 0ba8746d0a20a0f08a57435d90af3ab91e99c621 (patch) | |
| tree | ee2729d6d87838e12cc9d044ea8e92d18d33f636 | |
| parent | 71b8cb011122bec45a6d7c683b392a7d5a6faa7f (diff) | |
| download | gcc-0ba8746d0a20a0f08a57435d90af3ab91e99c621.zip gcc-0ba8746d0a20a0f08a57435d90af3ab91e99c621.tar.gz gcc-0ba8746d0a20a0f08a57435d90af3ab91e99c621.tar.bz2 | |
decl.c (duplicate_decls): Use DECL_IS_BUILTIN rather than test DECL_SOURCE_LOCATION directly.
* decl.c (duplicate_decls): Use DECL_IS_BUILTIN rather than test
DECL_SOURCE_LOCATION directly.
From-SVN: r160806
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 07d565d..ce7d085 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2010-06-15 Jason Merrill <jason@redhat.com> + * decl.c (duplicate_decls): Use DECL_IS_BUILTIN rather than test + DECL_SOURCE_LOCATION directly. + * class.c (type_has_user_provided_default_constructor): Use sufficient_parms_p. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 3108f9d..9541252 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -1295,7 +1295,7 @@ duplicate_decls (tree newdecl, tree olddecl, bool newdecl_is_friend) /* Even if the types match, prefer the new declarations type for built-ins which have not been explicitly declared, for exception lists, etc... */ - else if (DECL_SOURCE_LOCATION (olddecl) == BUILTINS_LOCATION) + else if (DECL_IS_BUILTIN (olddecl)) { tree type = TREE_TYPE (newdecl); tree attribs = (*targetm.merge_type_attributes) |