mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-22 07:46:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drops custom utf16 string implementation (from cdd3317ded), uses C++11 one.

Browse Source 
Patch By: sera
Differential Revision: https://code.wildfiregames.com/D4223
This was SVN commit r26023.
This commit is contained in:
vladislavbelov
2021-11-29 12:10:41 +00:00
parent e1374252b7
commit af567560b8
10 changed files with 23 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/scriptinterface/JSON.cpp
+5 -4
View File
@@ -21,12 +21,13 @@
#include "ps/CStr.h"
#include "ps/Filesystem.h"
#include "ps/utf16string.h"
#include "scriptinterface/FunctionWrapper.h"
#include "scriptinterface/ScriptExceptions.h"
#include "scriptinterface/ScriptRequest.h"
#include "scriptinterface/ScriptTypes.h"
#include <string>
// Ignore warnings in SM headers.
#if GCC_VERSION || CLANG_VERSION
# pragma GCC diagnostic push
@@ -47,8 +48,8 @@
bool Script::ParseJSON(const ScriptRequest& rq, const std::string& string_utf8, JS::MutableHandleValue out)
{
std::wstring attrsW = wstring_from_utf8(string_utf8);
utf16string string(attrsW.begin(), attrsW.end());
if (JS_ParseJSON(rq.cx, reinterpret_cast<const char16_t*>(string.c_str()), (u32)string.size(), out))
std::u16string string(attrsW.begin(), attrsW.end());
if (JS_ParseJSON(rq.cx, string.c_str(), (u32)string.size(), out))
return true;
ScriptException::CatchPending(rq);
@@ -85,7 +86,7 @@ struct Stringifier
{
static bool callback(const char16_t* buf, u32 len, void* data)
{
utf16string str(buf, buf+len);
std::u16string str(buf, buf+len);
std::wstring strw(str.begin(), str.end());
Status err; // ignore Unicode errors