From f5f8836419f2db0fc4faaa8d72a89266177251d3 Mon Sep 17 00:00:00 2001
From: ayers <ayers@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 22 Oct 2005 09:31:12 +0000
Subject: [PATCH] 2005-10-22 David Ayers <d.ayers@inode.at>
* obj-c++.dg/except-1.mm: Simplify.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@105790 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/testsuite/ChangeLog | 4 ++++
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 8b7ea124e53a..ef1d49c3023b 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 d92ac795e85a..e06bea0a86c0 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
--
GitLab