diff options
| author | Nicola Pero <nicola.pero@meta-innovation.com> | 2010-09-29 22:21:20 +0000 |
|---|---|---|
| committer | Nicola Pero <nicola@gcc.gnu.org> | 2010-09-29 22:21:20 +0000 |
| commit | a6341d571d6cabf63ed6542d1048261281a2a028 (patch) | |
| tree | fb7bbb6d12ab02321562a9f6812dba274c2241c4 /gcc/objc | |
| parent | b14446e2ff63e339f814681b8ec7c467de819b66 (diff) | |
| download | gcc-a6341d571d6cabf63ed6542d1048261281a2a028.zip gcc-a6341d571d6cabf63ed6542d1048261281a2a028.tar.gz gcc-a6341d571d6cabf63ed6542d1048261281a2a028.tar.bz2 | |
In gcc/: 2010-09-29 Nicola Pero <nicola.pero@meta-innovation.com>
In gcc/:
2010-09-29 Nicola Pero <nicola.pero@meta-innovation.com>
Merge from 'apple/trunk' branch on FSF servers.
* c-parser.c: Applied change originally in c-parse.in.
2005-10-04 Fariborz Jahanian <fjahanian@apple.com>
Radar 4281748
* c-decl.c (start_decl): Check for redeclaration of class name.
* c-parse.in (after_type_declarator): Recognize CLASSNAME.
In gcc/c-family/:
2010-09-27 Nicola Pero <nicola.pero@meta-innovation.com>
Merge from 'apple/trunk' branch on FSF servers.
2005-10-04 Fariborz Jahanian <fjahanian@apple.com>
Radar 4281748
* c-common.h (objc_check_global_decl): New declaration.
* stub-objc.c (objc_check_global_decl): New stub.
In gcc/objc/:
2010-09-28 Nicola Pero <nicola.pero@meta-innovation.com>
Merge from 'apple/trunk' branch on FSF servers.
2005-10-04 Fariborz Jahanian <fjahanian@apple.com>
Radar 4281748
* objc-act.c (objc_check_global_decl): New
In gcc/testsuite/:
2010-09-28 Nicola Pero <nicola.pero@meta-innovation.com>
Merge from 'apple/trunk' branch on FSF servers.
2005-10-04 Fariborz Jahanian <fjahanian@apple.com>
Radar 4281748
* objc.dg/naming-2.m: Update
* objc.dg/naming-3.m: New
From-SVN: r164735
Diffstat (limited to 'gcc/objc')
| -rw-r--r-- | gcc/objc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/objc/objc-act.c | 8 |
2 files changed, 17 insertions, 0 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index 94c7ffa..1f5338a 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,12 @@ +2010-09-28 Nicola Pero <nicola.pero@meta-innovation.com> + + Merge from 'apple/trunk' branch on FSF servers. + + 2005-10-04 Fariborz Jahanian <fjahanian@apple.com> + + Radar 4281748 + * objc-act.c (objc_check_global_decl): New + 2010-09-29 Nicola Pero <nicola.pero@meta-innovation.com> * objc-act.c (objc_is_reserved_word): Removed. diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index 87eb11b..f63cde0 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -1495,6 +1495,14 @@ objc_check_decl (tree decl) type); } +void +objc_check_global_decl (tree decl) +{ + tree id = DECL_NAME (decl); + if (objc_is_class_name (id) && global_bindings_p()) + error ("redeclaration of Objective-C class %qs", IDENTIFIER_POINTER (id)); +} + /* Construct a PROTOCOLS-qualified variant of INTERFACE, where INTERFACE may either name an Objective-C class, or refer to the special 'id' or 'Class' types. If INTERFACE is not a valid ObjC type, just return it unchanged. */ |