diff options
Diffstat (limited to 'gcc/objcp')
| -rw-r--r-- | gcc/objcp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/objcp/objcp-decl.h | 11 |
2 files changed, 7 insertions, 9 deletions
diff --git a/gcc/objcp/ChangeLog b/gcc/objcp/ChangeLog index c4183ea31d2..63b37304887 100644 --- a/gcc/objcp/ChangeLog +++ b/gcc/objcp/ChangeLog @@ -1,3 +1,8 @@ +2014-04-14 Paolo Carlini <paolo.carlini@oracle.com> + + * objcp-decl.h (OBJC_TYPE_NAME, OBJC_SET_TYPE_NAME): Use + TYPE_IDENTIFIER. + 2014-01-02 Richard Sandiford <rdsandiford@googlemail.com> Update copyright years diff --git a/gcc/objcp/objcp-decl.h b/gcc/objcp/objcp-decl.h index bcfcbdecd24..652f9933895 100644 --- a/gcc/objcp/objcp-decl.h +++ b/gcc/objcp/objcp-decl.h @@ -55,16 +55,9 @@ extern tree objcp_end_compound_stmt (tree, int); objcp_end_compound_stmt (stmt, flags) #undef OBJC_TYPE_NAME -#define OBJC_TYPE_NAME(type) \ - (TYPE_NAME (type) && TREE_CODE (TYPE_NAME (type)) == TYPE_DECL \ - ? DECL_NAME (TYPE_NAME (type)) \ - : TYPE_NAME (type)) +#define OBJC_TYPE_NAME(type) (TYPE_IDENTIFIER (type)) #undef OBJC_SET_TYPE_NAME -#define OBJC_SET_TYPE_NAME(type, name) \ - if(TYPE_NAME (type) && TREE_CODE (TYPE_NAME (type)) == TYPE_DECL) \ - DECL_NAME (TYPE_NAME (type)) = name; \ - else \ - TYPE_NAME (type) = name; +#define OBJC_SET_TYPE_NAME(type, name) (TYPE_IDENTIFIER (type) = (name)) #undef TYPE_OBJC_INFO #define TYPE_OBJC_INFO(TYPE) LANG_TYPE_CLASS_CHECK (TYPE)->objc_info |