Ported back to the iPhone.

diff --git a/ObjectiveC/Internal.hpp b/ObjectiveC/Internal.hpp
index b6d683a86af1029dd4b6decd3612e38012a78353..f305fa97a952bfc3488f9c272b052d89816436ec 100644 (file)
--- a/ObjectiveC/Internal.hpp
+++ b/ObjectiveC/Internal.hpp
@@ -79,10 +79,6 @@ struct Instance :
 
     static JSObjectRef Make(JSContextRef context, id object, Flags flags = None);
 
 
     static JSObjectRef Make(JSContextRef context, id object, Flags flags = None);
 

-    static _finline JSObjectRef Make(JSContextRef context, Class object) {
-        return Make(context, (id) object);
-    }
-

     _finline id GetValue() const {
         return reinterpret_cast<id>(value_);
     }
     _finline id GetValue() const {
         return reinterpret_cast<id>(value_);
     }

diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm
index a718bb8839bddebf943e4a36f7fb59d4e2881525..787a81fef1e844cb710f70c8b13bf707328bd6a7 100644 (file)
--- a/ObjectiveC/Library.mm
+++ b/ObjectiveC/Library.mm
@@ -1060,7 +1060,7 @@ JSValueRef CYCastJSValue(JSContextRef context, id value) { CYPoolTry {
 
 - (NSEnumerator *) keyEnumerator { CYObjectiveTry {
     JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context_, object_));
 
 - (NSEnumerator *) keyEnumerator { CYObjectiveTry {
     JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context_, object_));

-    NSEnumerator *enumerator([CYCastNSArray(names) objectEnumerator]);
+    NSEnumerator *enumerator([CYCastNSArray(context_, names) objectEnumerator]);

     JSPropertyNameArrayRelease(names);
     return enumerator;
 } CYObjectiveCatch }
     JSPropertyNameArrayRelease(names);
     return enumerator;
 } CYObjectiveCatch }


@@ -2050,7 +2050,7 @@ static JSValueRef CYValue_callAsFunction_$cya(JSContextRef context, JSObjectRef
 
 static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
 
 static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));

-    return Instance::Make(context, object_getClass(internal->GetValue()));
+    return Instance::Make(context, (id) object_getClass(internal->GetValue()));

 }
 
 static JSValueRef Instance_getProperty_protocol(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
 }
 
 static JSValueRef Instance_getProperty_protocol(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {