1
0
forked from mirrors/0ad

SpiderMonkey 38 upgrade: 18/35

Renamed JS_Compile{,UC}Function to JS::CompileFunction. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1089026

This was SVN commit r18672.
This commit is contained in:
Itms
2016-09-02 16:34:02 +00:00
parent 8747b1c098
commit 2aa75a05d4
2 changed files with 11 additions and 10 deletions
+4 -5
View File
@@ -845,11 +845,10 @@ bool ScriptInterface::LoadScript(const VfsPath& filename, const std::string& cod
options.setFileAndLine(filenameStr.c_str(), lineNo);
options.setCompileAndGo(true);
JS::RootedFunction func(m->m_cx,
JS_CompileUCFunction(m->m_cx, global, NULL, 0, NULL,
reinterpret_cast<const char16_t*>(codeUtf16.c_str()), (uint)(codeUtf16.length()), options)
);
if (!func)
JS::RootedFunction func(m->m_cx);
JS::AutoObjectVector emptyScopeChain(m->m_cx);
if (!JS::CompileFunction(m->m_cx, emptyScopeChain, options, NULL, 0, NULL,
reinterpret_cast<const char16_t*>(codeUtf16.c_str()), (uint)(codeUtf16.length()), &func))
return false;
JS::RootedValue rval(m->m_cx);