diff options
| author | David Ayers <d.ayers@inode.at> | 2005-10-22 11:31:12 +0200 |
|---|---|---|
| committer | David Ayers <ayers@gcc.gnu.org> | 2005-10-22 09:31:12 +0000 |
| commit | 131452a00ef71d89745379d4dc4f1923802b3b89 (patch) | |
| tree | a7ab2b3708924576fd2a6dd5733cf4c032a76310 | |
| parent | 7b475fd2ce643f26ac33f09614252fea440e9c07 (diff) | |
| download | gcc-131452a00ef71d89745379d4dc4f1923802b3b89.zip gcc-131452a00ef71d89745379d4dc4f1923802b3b89.tar.gz gcc-131452a00ef71d89745379d4dc4f1923802b3b89.tar.bz2 | |
except-1.mm: Simplify.
2005-10-22 David Ayers <d.ayers@inode.at>
* obj-c++.dg/except-1.mm: Simplify.
From-SVN: r105790
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/obj-c++.dg/except-1.mm | 36 |
2 files changed, 6 insertions, 34 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8b7ea12..ef1d49c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2005-10-22 David Ayers <d.ayers@inode.at> + + * obj-c++.dg/except-1.mm: Simplify. + 2005-10-21 David Ayers <d.ayers@inode.at> * obj-c++.dg/except-1.mm: Generalize for both Objective-C runtimes. diff --git a/gcc/testsuite/obj-c++.dg/except-1.mm b/gcc/testsuite/obj-c++.dg/except-1.mm index d92ac79..e06bea0 100644 --- a/gcc/testsuite/obj-c++.dg/except-1.mm +++ b/gcc/testsuite/obj-c++.dg/except-1.mm @@ -9,27 +9,16 @@ #include <stdio.h> #include <stdlib.h> -#ifndef __NEXT_RUNTIME__ -extern "C" { - extern id class_create_instance(Class _class); -} -#else -extern "C" { - extern id (*_zoneAlloc)(Class, unsigned int, void *); - extern void *malloc_default_zone(void); -} -#endif -@interface RObject { +@interface Object { Class isa; } -+ initialize; + alloc; - init; @end // ObjectiveC class header -@interface ObjCclass : RObject { +@interface ObjCclass : Object { } -(void)method1; -(void)method2; @@ -80,24 +69,3 @@ void CPPclass::function1() /* Shouldn't be here because we threw. */ abort (); } - -@implementation RObject -+ initialize -{ - return self; -} - -- init -{ - return self; -} - -+ alloc -{ -#ifndef __NEXT_RUNTIME__ - return class_create_instance(self); -#else - return (*_zoneAlloc)((Class)self, 0, malloc_default_zone()); -#endif -} -@end |