Skip to content

Commit 927d54a

Browse files
committed
Style unicode.cpp/h
No functional changes intended
1 parent e433cd4 commit 927d54a

File tree

2 files changed

+40
-3
lines changed

2 files changed

+40
-3
lines changed

src/util/unicode.cpp

+37
Original file line numberDiff line numberDiff line change
@@ -263,12 +263,36 @@ const char **narrow_argv(int argc, const wchar_t **argv_wide)
263263
return argv_narrow;
264264
}
265265

266+
/*******************************************************************\
267+
268+
Function: utf8_to_utf16_big_endian
269+
270+
Inputs: String in UTF-8 format
271+
272+
Outputs: String in UTF-16BE format
273+
274+
Purpose: Note this requires g++-5 libstdc++ / libc++ / MSVC2010+
275+
276+
\*******************************************************************/
277+
266278
std::wstring utf8_to_utf16_big_endian(const std::string& in)
267279
{
268280
std::wstring_convert<std::codecvt_utf8_utf16<wchar_t> > converter;
269281
return converter.from_bytes(in);
270282
}
271283

284+
/*******************************************************************\
285+
286+
Function: utf8_to_utf16_little_endian
287+
288+
Inputs: String in UTF-8 format
289+
290+
Outputs: String in UTF-16LE format
291+
292+
Purpose: Note this requires g++-5 libstdc++ / libc++ / MSVC2010+
293+
294+
\*******************************************************************/
295+
272296
std::wstring utf8_to_utf16_little_endian(const std::string& in)
273297
{
274298
const std::codecvt_mode mode=std::codecvt_mode::little_endian;
@@ -282,6 +306,19 @@ std::wstring utf8_to_utf16_little_endian(const std::string& in)
282306
return converter.from_bytes(in);
283307
}
284308

309+
/*******************************************************************\
310+
311+
Function: utf16_little_endian_to_ascii
312+
313+
Inputs: String in UTF-16LE format
314+
315+
Outputs: String in US-ASCII format, with \uxxxx escapes for other
316+
characters
317+
318+
Purpose:
319+
320+
\*******************************************************************/
321+
285322
std::string utf16_little_endian_to_ascii(const std::wstring& in)
286323
{
287324
std::ostringstream result;

src/util/unicode.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ std::wstring widen(const std::string &s);
2222
std::string utf32_to_utf8(const std::basic_string<unsigned int> &s);
2323
std::string utf16_to_utf8(const std::basic_string<unsigned short int> &s);
2424

25-
std::wstring utf8_to_utf16_big_endian(const std::string&);
26-
std::wstring utf8_to_utf16_little_endian(const std::string&);
27-
std::string utf16_little_endian_to_ascii(const std::wstring& in);
25+
std::wstring utf8_to_utf16_big_endian(const std::string &);
26+
std::wstring utf8_to_utf16_little_endian(const std::string &);
27+
std::string utf16_little_endian_to_ascii(const std::wstring &in);
2828

2929
const char **narrow_argv(int argc, const wchar_t **argv_wide);
3030

0 commit comments

Comments
 (0)