diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2024-09-13 09:20:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-13 09:20:57 -0400 |
| commit | 7ced89435d702b8a6bc02908769bed47e20d6ec0 (patch) | |
| tree | bb4735ba807f4d4caf7cf6161462557cfc9864bd /indra/llcommon/llstring.h | |
| parent | 3d191c09b1b1eb6726fe67f6fdf5445d83536578 (diff) | |
| parent | d6f3f20af6cccf53746cbf1fdf39bc4e235c4f0d (diff) | |
Merge pull request #2548 from secondlife/lua-frame-profile
Make Develop->Render Tests->Frame Profile dump JSON to a file too (#2412)
Diffstat (limited to 'indra/llcommon/llstring.h')
| -rw-r--r-- | indra/llcommon/llstring.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index e4be1efaed..b552aede82 100644 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -707,7 +707,11 @@ ll_convert_forms(ll_convert_alias, LLWString, std::string, utf8str_to_ // Same function, better name. JC inline LLWString utf8string_to_wstring(const std::string& utf8_string) { return utf8str_to_wstring(utf8_string); } -LL_COMMON_API std::ptrdiff_t wchar_to_utf8chars(llwchar inchar, char* outchars); +// return a UTF-8 string representation of a single llwchar, which we +// occasionally require: +// cheaper than ll_convert_to<std::string>(LLWString(1, inchar)) +LL_COMMON_API std::string wchar_to_utf8chars(llwchar inchar); +ll_convert_alias(std::string, llwchar, wchar_to_utf8chars(in)); ll_convert_forms(ll_convert_alias, std::string, LLWString, wstring_to_utf8str); ll_convert_forms(ll_convert_u16_alias, std::string, llutf16string, utf16str_to_utf8str); |