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

SpiderMonkey 38 upgrade: 10/35

Browse Source 
Use operator= instead of .set(). Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1128110

This was SVN commit r18664.
This commit is contained in:
Nicolas Auvray 2016-09-02 16:24:46 +00:00
parent c7c3ef9f92
commit 761abd587e
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/network/NetMessageSim.cpp
View File

@ -128,7 +128,7 @@ CSimulationMessage::CSimulationMessage(const CSimulationMessage& orig) :
m_Turn(orig.m_Turn),
CNetMessage(orig)
{
m_Data.set(orig.m_Data);
m_Data = orig.m_Data;
}
u8* CSimulationMessage::Serialize(u8* pBuffer) const

2
source/network/NetServer.cpp
View File

@ -1364,7 +1364,7 @@ void CNetServerWorker::UpdateGameAttributes(JS::MutableHandleValue attrs)
return;
CGameSetupMessage gameSetupMessage(GetScriptInterface());
gameSetupMessage.m_Data.set(m_GameAttributes.get());
gameSetupMessage.m_Data = m_GameAttributes.get();
Broadcast(&gameSetupMessage);
}

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

@ -1,4 +1,4 @@
/* Copyright (C) 2012 Wildfire Games.
/* Copyright (C) 2015 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -44,7 +44,7 @@ public:
{
JSContext* cx = m_ScriptInterface.GetContext();
JSAutoRequest rq(cx);
m_AIs.set(JS_NewArrayObject(cx, 0));
m_AIs = JS_NewArrayObject(cx, 0);
}
void Run()

4
source/simulation2/helpers/SimulationCommand.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2010 Wildfire Games.
/* Copyright (C) 2015 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -41,7 +41,7 @@ struct SimulationCommand
SimulationCommand& operator=(SimulationCommand&& other)
{
this->player = other.player;
this->data.set(other.data);
this->data = other.data;
return *this;
}

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

@ -38,7 +38,7 @@ CStdDeserializer::CStdDeserializer(ScriptInterface& scriptInterface, std::istrea
// Add a dummy tag because the serializer uses the tag 0 to indicate that a value
// needs to be serialized and then tagged
m_dummyObject.set(JS_NewObject(cx, nullptr, JS::NullPtr(), JS::NullPtr()));
m_dummyObject = JS_NewObject(cx, nullptr, JS::NullPtr(), JS::NullPtr());
m_ScriptBackrefs.push_back(JS::Heap<JSObject*>(m_dummyObject));
}