OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

In gcc/testsuite/: 2010-09-30 Nicola Pero <nicola.pero@meta-innovation.com> 

In gcc/testsuite/:
2010-09-30  Nicola Pero  <nicola.pero@meta-innovation.com>

        Merge from 'apple/trunk' branch on FSF servers.

        2005-10-04  Fariborz Jahanian <fjahanian@apple.com>

        Radar 4278236
        * obj-c++.dg/bad-forward-decl.mm: New

In gcc/objc/:
2010-09-30  Nicola Pero  <nicola.pero@meta-innovation.com>

        Merge from 'apple/trunk' branch on FSF servers.

        2005-10-04  Fariborz Jahanian <fjahanian@apple.com>

        Radar 4278236
        * objc-act.c (objc_declare_class): Pick the right
        type tree.

From-SVN: r164745
This commit is contained in:
Nicola Pero 2010-09-30 08:33:54 +00:00 committed by Nicola Pero
parent 49b91f055d
commit 2631eead41
4 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/objc/ChangeLog
View File

@ -1,3 +1,13 @@
2010-09-30 Nicola Pero <nicola.pero@meta-innovation.com>
Merge from 'apple/trunk' branch on FSF servers.
2005-10-04 Fariborz Jahanian <fjahanian@apple.com>
Radar 4278236
* objc-act.c (objc_declare_class): Pick the right
type tree.
2010-09-29 Nicola Pero <nicola.pero@meta-innovation.com>
Merge from 'apple/trunk' branch on FSF servers.

4
gcc/objc/objc-act.c
View File

@ -3092,7 +3092,9 @@ objc_declare_class (tree ident_list)
if (record)
{
if (TREE_CODE (record) == TYPE_DECL)
type = DECL_ORIGINAL_TYPE (record);
type = DECL_ORIGINAL_TYPE (record) ?
DECL_ORIGINAL_TYPE (record) :
TREE_TYPE (record);
if (!TYPE_HAS_OBJC_INFO (type)
|| !TYPE_OBJC_INTERFACE (type))

9
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,12 @@
2010-09-30 Nicola Pero <nicola.pero@meta-innovation.com>
Merge from 'apple/trunk' branch on FSF servers.
2005-10-04 Fariborz Jahanian <fjahanian@apple.com>
Radar 4278236
* obj-c++.dg/bad-forward-decl.mm: New
2010-09-30 Eric Botcazou <ebotcazou@adacore.com>
* ada/acats/run_acats: Revert revision 157037.

3
gcc/testsuite/obj-c++.dg/bad-forward-decl.mm Normal file
View File

@ -0,0 +1,3 @@
class TestCPP { }; /* { dg-error "previous declaration of" } */
@class TestCPP; /* { dg-error "redeclared as different kind of symbol" } */