diff --git a/cocos/scripting/js-bindings/manual/ScriptingCore.cpp b/cocos/scripting/js-bindings/manual/ScriptingCore.cpp index 19354fa161..ae2481d067 100644 --- a/cocos/scripting/js-bindings/manual/ScriptingCore.cpp +++ b/cocos/scripting/js-bindings/manual/ScriptingCore.cpp @@ -1869,14 +1869,14 @@ void ScriptingCore::enableDebugger(unsigned int port) } } -JS::HandleObject NewGlobalObject(JSContext* cx, bool debug) +JSObject* NewGlobalObject(JSContext* cx, bool debug) { JS::CompartmentOptions options; options.setVersion(JSVERSION_LATEST); JS::RootedObject glob(cx, JS_NewGlobalObject(cx, &global_class, &shellTrustedPrincipals, JS::DontFireOnNewGlobalHook, options)); if (!glob) { - return JS::NullPtr(); + return nullptr; } JSAutoCompartment ac(cx, glob); bool ok = true; @@ -1886,7 +1886,7 @@ JS::HandleObject NewGlobalObject(JSContext* cx, bool debug) if (ok && debug) ok = JS_DefineDebuggerObject(cx, glob); if (!ok) - return JS::NullPtr(); + return nullptr; JS_FireOnNewGlobalObject(cx, glob); diff --git a/cocos/scripting/js-bindings/manual/ScriptingCore.h b/cocos/scripting/js-bindings/manual/ScriptingCore.h index b9ac8b295c..336909455c 100644 --- a/cocos/scripting/js-bindings/manual/ScriptingCore.h +++ b/cocos/scripting/js-bindings/manual/ScriptingCore.h @@ -517,7 +517,7 @@ public: void restartVM(); }; -JS::HandleObject NewGlobalObject(JSContext* cx, bool debug = false); +JSObject* NewGlobalObject(JSContext* cx, bool debug = false); bool jsb_set_reserved_slot(JSObject *obj, uint32_t idx, jsval value); bool jsb_get_reserved_slot(JSObject *obj, uint32_t idx, jsval& ret); diff --git a/external/config.json b/external/config.json index 4c7cebe515..0739cd1c10 100644 --- a/external/config.json +++ b/external/config.json @@ -1,6 +1,6 @@ { - "version":"v3-deps-78", - "zip_file_size":"119277304", + "version":"v3-deps-79", + "zip_file_size":"124402591", "repo_name":"cocos2d-x-3rd-party-libs-bin", "repo_parent":"https://github.com/cocos2d/", "move_dirs":{