gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Use .assign instead of operator=.

Browse Source 
This was SVN commit r17631.
This commit is contained in:
leper
2016-01-11 20:03:28 +00:00
parent d08044c8ad
commit 775f856421
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/scriptinterface/ScriptConversions.cpp
+2 -2
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2015 Wildfire Games.
/* Copyright (C) 2016 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@@ -154,7 +154,7 @@ template<> bool ScriptInterface::FromJSVal<std::wstring>(JSContext* cx, JS::Hand
const char16_t* ch = JS_GetStringCharsAndLength(cx, str, &length);
if (!ch)
FAIL("JS_GetStringsCharsAndLength failed"); // out of memory
out = std::wstring(ch, ch + length);
out.assign(ch, ch + length);
return true;
}
source/simulation2/serialization/BinarySerializer.cpp
+2 -2
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2015 Wildfire Games.
/* Copyright (C) 2016 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@@ -345,7 +345,7 @@ void CBinarySerializerScriptImpl::HandleScriptVal(JS::HandleValue val)
size_t length;
const char16_t* ch = JS_GetStringCharsAndLength(cx, string, &length);
if (ch && length > 0)
funcname = std::wstring(ch, ch + length);
funcname.assign(ch, ch + length);
}
}