Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

SpiderMonkey 38 upgrade: 11/35

Browse Source 
Renamed JS_CallHeapFooTracer to JS_CallFooTracer. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1052388

This was SVN commit r18665.
This commit is contained in:
Nicolas Auvray 2016-09-02 16:25:42 +00:00
parent 761abd587e
commit b01300c222
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/gui/IGUIObject.cpp
View File

@ -541,7 +541,7 @@ bool IGUIObject::IsRootObject() const
void IGUIObject::TraceMember(JSTracer* trc)
{
for (std::pair<const CStr, JS::Heap<JSObject*>>& handler : m_ScriptHandlers)
JS_CallHeapObjectTracer(trc, &handler.second, "IGUIObject::m_ScriptHandlers");
JS_CallObjectTracer(trc, &handler.second, "IGUIObject::m_ScriptHandlers");
}
PSRETURN IGUIObject::LogInvalidSettings(const CStr8& Setting) const

2
source/network/NetClient.cpp
View File

@ -144,7 +144,7 @@ CNetClient::~CNetClient()
void CNetClient::TraceMember(JSTracer *trc)
{
for (JS::Heap<JS::Value>& guiMessage : m_GuiMessageQueue)
JS_CallHeapValueTracer(trc, &guiMessage, "m_GuiMessageQueue");
JS_CallValueTracer(trc, &guiMessage, "m_GuiMessageQueue");
}
void CNetClient::SetUserName(const CStrW& username)

4
source/simulation2/components/CCmpAIManager.cpp
View File

@ -789,9 +789,9 @@ private:
void TraceMember(JSTracer *trc)
{
for (std::pair<const std::wstring, JS::Heap<JSObject*>>& prototype : m_DeserializablePrototypes)
JS_CallHeapObjectTracer(trc, &prototype.second, "CAIWorker::m_DeserializablePrototypes");
JS_CallObjectTracer(trc, &prototype.second, "CAIWorker::m_DeserializablePrototypes");
for (std::pair<const VfsPath, JS::Heap<JS::Value>>& metadata : m_PlayerMetadata)
JS_CallHeapValueTracer(trc, &metadata.second, "CAIWorker::m_PlayerMetadata");
JS_CallValueTracer(trc, &metadata.second, "CAIWorker::m_PlayerMetadata");
}
void LoadMetadata(const VfsPath& path, JS::MutableHandleValue out)

4
source/simulation2/serialization/StdDeserializer.cpp
View File

@ -56,10 +56,10 @@ void CStdDeserializer::Trace(JSTracer *trc, void *data)
void CStdDeserializer::TraceMember(JSTracer *trc)
{
for (size_t i=0; i<m_ScriptBackrefs.size(); ++i)
JS_CallHeapObjectTracer(trc, &m_ScriptBackrefs[i], "StdDeserializer::m_ScriptBackrefs");
JS_CallObjectTracer(trc, &m_ScriptBackrefs[i], "StdDeserializer::m_ScriptBackrefs");
for (std::pair<const std::wstring, JS::Heap<JSObject*>>& proto : m_SerializablePrototypes)
JS_CallHeapObjectTracer(trc, &proto.second, "StdDeserializer::m_SerializablePrototypes");
JS_CallObjectTracer(trc, &proto.second, "StdDeserializer::m_SerializablePrototypes");
}
void CStdDeserializer::Get(const char* name, u8* data, size_t len)