From 017580252940649865e66002c7bc292687c56a54 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sun, 18 Oct 2020 02:26:27 +0300 Subject: more convenience overloads --- include/winapi/utf8.hpp | 1 + src/convert.cpp | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/winapi/utf8.hpp b/include/winapi/utf8.hpp index 57b3c53..c6fc77b 100644 --- a/include/winapi/utf8.hpp +++ b/include/winapi/utf8.hpp @@ -16,6 +16,7 @@ std::wstring widen(const std::vector&); std::wstring widen(const void*, std::size_t nb); std::string narrow(const std::wstring&); +std::string narrow(const wchar_t*, std::size_t nch); std::string narrow(const std::vector&); std::string narrow(const void*, std::size_t nb); diff --git a/src/convert.cpp b/src/convert.cpp index 39485ee..f3f0730 100644 --- a/src/convert.cpp +++ b/src/convert.cpp @@ -116,8 +116,12 @@ std::wstring widen(const void* src, std::size_t in_nb) { } std::string narrow(const std::wstring& src) { - static_assert(sizeof(std::wstring::value_type) == sizeof(WCHAR), "wchar_t != WCHAR"); - return narrow(src.c_str(), src.size() * sizeof(std::wstring::value_type)); + return narrow(src.c_str(), src.size()); +} + +std::string narrow(const wchar_t* src, std::size_t nch) { + static_assert(sizeof(wchar_t) == sizeof(WCHAR), "wchar_t != WCHAR"); + return narrow(src, nch * sizeof(wchar_t)); } std::string narrow(const std::vector& src) { -- cgit v1.2.3