From 9115a909b147203c4b7a320ded867740da04c36d Mon Sep 17 00:00:00 2001 From: David Chisnall Date: Sun, 24 Dec 2017 16:41:13 +0000 Subject: [PATCH] Delete more code. The reduced test case is now fairly close to minimal. --- Test/minRep1.h | 9 --------- Test/minRep2.h | 11 ----------- Test/minRep2.mm | 6 +++--- Test/minRepM.h | 10 ---------- Test/minRepM.m | 5 ++--- 5 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 Test/minRep1.h delete mode 100644 Test/minRep2.h delete mode 100644 Test/minRepM.h diff --git a/Test/minRep1.h b/Test/minRep1.h deleted file mode 100644 index aa07f16..0000000 --- a/Test/minRep1.h +++ /dev/null @@ -1,9 +0,0 @@ -#import "Test.h" - -#import "minRep2.h" - -@interface MinRep1 : Test { -} -- (void)poke; - -@end diff --git a/Test/minRep2.h b/Test/minRep2.h deleted file mode 100644 index 60a88bd..0000000 --- a/Test/minRep2.h +++ /dev/null @@ -1,11 +0,0 @@ -#import "Test.h" - -#ifdef __cplusplus -#define EXTERN_C extern "C" -#else -#define EXTERN_C -#endif - -EXTERN_C void rethrow(id); -EXTERN_C void poke_objcxx(void); - diff --git a/Test/minRep2.mm b/Test/minRep2.mm index 3657102..48fb7c6 100644 --- a/Test/minRep2.mm +++ b/Test/minRep2.mm @@ -1,10 +1,10 @@ #import "Test.h" +#import "stdio.h" -#import "minRep2.h" +extern "C" void rethrow(id); -#import "stdio.h" -void poke_objcxx(void) +extern "C" void poke_objcxx(void) { @try { printf("Raising MyException\n"); diff --git a/Test/minRepM.h b/Test/minRepM.h deleted file mode 100644 index 16915c6..0000000 --- a/Test/minRepM.h +++ /dev/null @@ -1,10 +0,0 @@ -#import "Test.h" - -#import "minRep1.h" - -@interface MinRepM : Test { - MinRep1 *_mr1; -} -- (void)poke; - -@end; diff --git a/Test/minRepM.m b/Test/minRepM.m index 920f7b0..ef02d53 100644 --- a/Test/minRepM.m +++ b/Test/minRepM.m @@ -1,10 +1,9 @@ #import "Test.h" -#import "minRepM.h" -#import "minRep2.h" - #import "stdio.h" +void poke_objcxx(void); + void rethrow(id x) { @throw x;