boost/log
2
0
Fork 0
mirror of https://github.com/boostorg/log.git synced 2026-02-01 08:32:15 +00:00
Code Issues Projects Releases Wiki Activity

Extracted platform-specific logic regarding interprocess object names to a separate object_name wrapper. Use this wrapper wherever interprocess queue name was used. Added a test for the wrapper. Extracted auto_handle to a separate header.

Browse Source
This commit is contained in:
Andrey Semashev
2016-03-07 19:20:23 +03:00
parent 1852ded16f
commit 05826649a0
17 changed files with 983 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/code_conversion.cpp
View File

@@ -213,7 +213,7 @@ std::wstring utf8_to_utf16(const char* str)
if (utf8_len == 0)
return std::wstring();
else if (BOOST_UNLIKELY(utf8_len > static_cast< std::size_t >((std::numeric_limits< int >::max)())))
BOOST_LOG_THROW_DESCR(bad_alloc, "Multibyte string too long");
BOOST_LOG_THROW_DESCR(bad_alloc, "UTF-8 string too long");
int len = boost::detail::winapi::MultiByteToWideChar(boost::detail::winapi::CP_UTF8_, boost::detail::winapi::MB_ERR_INVALID_CHARS_, str, static_cast< int >(utf8_len), NULL, 0);
if (BOOST_LIKELY(len > 0))
@@ -232,6 +232,32 @@ std::wstring utf8_to_utf16(const char* str)
BOOST_LOG_UNREACHABLE_RETURN(std::wstring());
}
//! Converts UTF-16 to UTF-8
std::string utf16_to_utf8(const wchar_t* wstr)
{
std::size_t utf16_len = std::wcslen(wstr);
if (utf16_len == 0)
return std::string();
else if (BOOST_UNLIKELY(utf16_len > static_cast< std::size_t >((std::numeric_limits< int >::max)())))
BOOST_LOG_THROW_DESCR(bad_alloc, "UTF-16 string too long");
int len = boost::detail::winapi::WideCharToMultiByte(boost::detail::winapi::CP_UTF8_, boost::detail::winapi::MB_ERR_INVALID_CHARS_, wstr, static_cast< int >(utf16_len), NULL, 0, NULL, NULL);
if (BOOST_LIKELY(len > 0))
{
std::string str;
str.resize(len);
len = boost::detail::winapi::WideCharToMultiByte(boost::detail::winapi::CP_UTF8_, boost::detail::winapi::MB_ERR_INVALID_CHARS_, wstr, static_cast< int >(utf16_len), &str[0], len, NULL, NULL);
if (BOOST_LIKELY(len > 0))
{
return str;
}
}
BOOST_LOG_THROW_DESCR(conversion_error, "Failed to convert UTF-16 to UTF-8");
BOOST_LOG_UNREACHABLE_RETURN(std::string());
}
#endif // defined(BOOST_WINDOWS)
} // namespace aux