From 8e0afb16a2b74230143c58e2d7b93ad848a443dd Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Thu, 13 Sep 2012 01:49:03 -0700 Subject: [PATCH] Make devoid argument of CYImplements default false. --- ObjectiveC/Library.mm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm index 209f4e1..db3196b 100644 --- a/ObjectiveC/Library.mm +++ b/ObjectiveC/Library.mm @@ -1493,7 +1493,7 @@ static JSValueRef CYObjectiveC_FromFFI(JSContextRef context, sig::Type *type, ff } } CYPoolCatch(NULL) return /*XXX*/ NULL; } -static bool CYImplements(id object, Class _class, SEL selector, bool devoid) { +static bool CYImplements(id object, Class _class, SEL selector, bool devoid = false) { if (objc_method *method = class_getInstanceMethod(_class, selector)) { if (!devoid) return true; @@ -1663,7 +1663,7 @@ static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object, static bool CYHasImplicitProperties(Class _class) { // XXX: this is an evil hack to deal with NSProxy; fix elsewhere - if (!CYImplements(_class, object_getClass(_class), @selector(cy$hasImplicitProperties), false)) + if (!CYImplements(_class, object_getClass(_class), @selector(cy$hasImplicitProperties))) return true; return [_class cy$hasImplicitProperties]; } @@ -1686,7 +1686,7 @@ static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStr CYPoolTry { // XXX: this is an evil hack to deal with NSProxy; fix elsewhere - if (CYImplements(self, _class, @selector(cy$hasProperty:), false)) + if (CYImplements(self, _class, @selector(cy$hasProperty:))) if ([self cy$hasProperty:name]) return true; } CYPoolCatch(false) @@ -1790,7 +1790,7 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr set[length + 4] = '\0'; if (SEL sel = sel_getUid(set)) - if (CYImplements(self, _class, sel, false)) { + if (CYImplements(self, _class, sel)) { JSValueRef arguments[1] = {value}; CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false, exception); return true; @@ -1860,7 +1860,7 @@ static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object, CYPoolTry { // XXX: this is an evil hack to deal with NSProxy; fix elsewhere - if (CYImplements(self, _class, @selector(cy$getPropertyNames:inContext:), false)) + if (CYImplements(self, _class, @selector(cy$getPropertyNames:inContext:))) [self cy$getPropertyNames:names inContext:context]; } CYPoolCatch() } -- 2.45.2