From 688058435150ad6032006496e204cc319d552213 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Fri, 13 Jan 2017 14:26:24 +0800 Subject: [PATCH] Fix compilation issues --- .../manual/extension/jsb_cocos2dx_extension_manual.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/native/cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp b/native/cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp index cd58ff9a33..42481cc81d 100644 --- a/native/cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp +++ b/native/cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp @@ -781,7 +781,7 @@ bool js_cocos2dx_extension_EventListenerAssetsManagerEx_create(JSContext *cx, ui { JS::RootedObject jstarget(cx, args.thisv().toObjectOrNull()); std::shared_ptr func(new JSFunctionWrapper(cx, jstarget, args.get(1))); - wrapper = func->get(); + wrapper = func.get(); auto lambda = [=](cocos2d::extension::EventAssetsManagerEx* larg0) -> void { JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET jsval largv[1]; @@ -810,16 +810,16 @@ bool js_cocos2dx_extension_EventListenerAssetsManagerEx_create(JSContext *cx, ui ; JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_extension_EventListenerAssetsManagerEx_create : Error processing arguments"); cocos2d::extension::EventListenerAssetsManagerEx* ret = cocos2d::extension::EventListenerAssetsManagerEx::create(arg0, arg1); - jsval jsret = JSVAL_NULL; + JS::RootedValue jsret(cx); if (ret) { JS::RootedObject jsobj(cx, js_get_or_create_jsobject(cx, ret)); + jsret = OBJECT_TO_JSVAL(jsobj); if (wrapper) { - wrapper->setOwner(cx, jsobj); + wrapper->setOwner(cx, jsret); } - jsret = OBJECT_TO_JSVAL(jsobj); } else { - jsret = JSVAL_NULL; + jsret = JS::NullValue(); } args.rval().set(jsret); return true;