except-1.mm: Simplify.

2005-10-22  David Ayers  <d.ayers@inode.at>

	* obj-c++.dg/except-1.mm: Simplify.

From-SVN: r105790
This commit is contained in:
David Ayers 2005-10-22 11:31:12 +02:00 committed by David Ayers
parent 7b475fd2ce
commit 131452a00e
2 changed files with 6 additions and 34 deletions

View File

@ -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.

View File

@ -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