diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-06-15 19:58:54 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-06-15 19:58:54 +0000 |
| commit | 7a3324ba6503ef106ec6306f045010b84e83b331 (patch) | |
| tree | ee2729d6d87838e12cc9d044ea8e92d18d33f636 /gcc | |
| parent | a0eca0c270319e3e299fd466fba02aab53fab4f9 (diff) | |
| download | gcc-7a3324ba6503ef106ec6306f045010b84e83b331.tar.gz | |
* decl.c (duplicate_decls): Use DECL_IS_BUILTIN rather than test
DECL_SOURCE_LOCATION directly.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160806 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -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 07d565d3698..ce7d08591f8 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 3108f9d0363..9541252125a 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) |