diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-05-14 15:24:16 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-05-14 15:24:16 +1000 |
| commit | 5b869b233d5f927f03dc9a70a7006c7dcbf5c88e (patch) | |
| tree | cbdab8a8f954763c72b6710be80fa6bd985ed5d4 /src/Document.cxx | |
| parent | cebd3113ce6b1e4dbc98f458c6033fd41e29d69d (diff) | |
| download | scintilla-mirror-5b869b233d5f927f03dc9a70a7006c7dcbf5c88e.tar.gz | |
Use string_view for UniConversion functions.
Diffstat (limited to 'src/Document.cxx')
| -rw-r--r-- | src/Document.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Document.cxx b/src/Document.cxx index fbe387f6d..bcc368a68 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -2939,12 +2939,13 @@ Sci::Position Cxx11RegexFindText(const Document *doc, Sci::Position minPos, Sci: bool matched = false; if (SC_CP_UTF8 == doc->dbcsCodePage) { - const size_t lenS = strlen(s); - std::vector<wchar_t> ws(lenS + 1); + const std::string_view sv(s); + const size_t lenS = sv.length(); + std::vector<wchar_t> ws(sv.length() + 1); #if WCHAR_T_IS_16 - const size_t outLen = UTF16FromUTF8(s, lenS, &ws[0], lenS); + const size_t outLen = UTF16FromUTF8(sv, &ws[0], lenS); #else - const size_t outLen = UTF32FromUTF8(s, lenS, reinterpret_cast<unsigned int *>(&ws[0]), lenS); + const size_t outLen = UTF32FromUTF8(sv, reinterpret_cast<unsigned int *>(&ws[0]), lenS); #endif ws[outLen] = 0; std::wregex regexp; |