diff --git a/source/scriptinterface/ScriptConversions.cpp b/source/scriptinterface/ScriptConversions.cpp index c608417497..5fb8b262a0 100644 --- a/source/scriptinterface/ScriptConversions.cpp +++ b/source/scriptinterface/ScriptConversions.cpp @@ -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(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; } diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp index b6faef129a..5265489869 100644 --- a/source/simulation2/serialization/BinarySerializer.cpp +++ b/source/simulation2/serialization/BinarySerializer.cpp @@ -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); } }