From dbdc26523c8e1787f6d18731caa698a28bd3eb13 Mon Sep 17 00:00:00 2001 From: David Chisnall Date: Thu, 24 Dec 2015 14:03:06 +0000 Subject: [PATCH] Fix the property introspection test some more. --- Test/PropertyIntrospectionTest2_arc.m | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Test/PropertyIntrospectionTest2_arc.m b/Test/PropertyIntrospectionTest2_arc.m index 157b50e..fd4b7d6 100644 --- a/Test/PropertyIntrospectionTest2_arc.m +++ b/Test/PropertyIntrospectionTest2_arc.m @@ -478,14 +478,14 @@ static void intDefault2Setter(id self, SEL _cmd, int value) { object_setIvar(self, ivar, (__bridge id)(void*)(intptr_t)value); } -static struct YorkshireTeaStruct* structDefault2Getter(id self, SEL _cmd) { - Ivar ivar = class_getInstanceVariable(objc_getClass("PropertyTest"), "structDefault"); - return (__bridge struct YorkshireTeaStruct*)object_getIvar(self, ivar); +static struct YorkshireTeaStruct structDefault2Getter(id self, SEL _cmd) { + struct YorkshireTeaStruct *s; + object_getInstanceVariable(self, "structDefault", &s); + return *s; } -void structDefault2Setter(id self, SEL _cmd, struct YorkshireTeaStruct* value) { - Ivar ivar = class_getInstanceVariable(objc_getClass("PropertyTest"), "structDefault"); - object_setIvar(self, ivar, (__bridge id)value); +void structDefault2Setter(id self, SEL _cmd, struct YorkshireTeaStruct value) { + object_setInstanceVariable(self, "structDefault", &value); } int main(void)