pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Don't use std::string_view's iterators as pointers to chars

Browse source 
Note: constructing std::string_view from iterators is OK in C++20, but we are not there yet.
Signed-off-by: Osyotr <Osyotr@users.noreply.github.com>
This commit is contained in:
Osyotr 2024-03-18 00:26:59 +03:00 • committed by Alexander Borsuk
parent fd535d00a2
commit 718990ec8f
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
base/string_utils.cpp
View file

@ -226,7 +226,7 @@ void Trim(std::string_view & sv)
if (beg != sv.end())
{
auto const end = std::find_if(sv.crbegin(), sv.crend(), [](auto c) { return !std::isspace(c); }).base();
sv = std::string_view(beg, std::distance(beg, end));
sv = std::string_view(sv.data() + std::distance(sv.begin(), beg), std::distance(beg, end));
}
else
sv = {};

5
base/string_utils.hpp
View file

@ -514,9 +514,10 @@ namespace impl
{
template <typename T> bool from_sv(std::string_view sv, T & t)
{
auto const res = std::from_chars(sv.begin(), sv.end(), t);
auto const end = sv.data() + sv.size();
auto const res = std::from_chars(sv.data(), end, t);
return (res.ec != std::errc::invalid_argument && res.ec != std::errc::result_out_of_range &&
res.ptr == sv.end());
res.ptr == end);
}
} // namespace impl