diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2022-11-28 12:16:21 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2022-11-28 16:57:36 +0000 |
| commit | a7b97a1f6b9d4993545525fd5cb334ae640ddf45 (patch) | |
| tree | cd0c27e74d90c92c6bae08c2ee196c557a52eb61 | |
| parent | 7b79fa930917da735f02b4f6911dfbb0a91f9714 (diff) | |
| download | gcc-a7b97a1f6b9d4993545525fd5cb334ae640ddf45.zip gcc-a7b97a1f6b9d4993545525fd5cb334ae640ddf45.tar.gz gcc-a7b97a1f6b9d4993545525fd5cb334ae640ddf45.tar.bz2 | |
libstdc++: Fix std::string_view for I32LP16 targets
For H8/300 with -msx -mn -mint32 the type of (_M_len - __pos) is int,
because int is wider than size_t so the operands are promoted.
libstdc++-v3/ChangeLog:
* include/std/string_view (basic_string_view::copy) Use explicit
template argument for call to std::min<size_t>.
(basic_string_view::substr): Likewise.
| -rw-r--r-- | libstdc++-v3/include/std/string_view | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/include/std/string_view b/libstdc++-v3/include/std/string_view index 2604af2..f42045d 100644 --- a/libstdc++-v3/include/std/string_view +++ b/libstdc++-v3/include/std/string_view @@ -315,7 +315,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { __glibcxx_requires_string_len(__str, __n); __pos = std::__sv_check(size(), __pos, "basic_string_view::copy"); - const size_type __rlen = std::min(__n, _M_len - __pos); + const size_type __rlen = std::min<size_t>(__n, _M_len - __pos); // _GLIBCXX_RESOLVE_LIB_DEFECTS // 2777. basic_string_view::copy should use char_traits::copy traits_type::copy(__str, data() + __pos, __rlen); @@ -327,7 +327,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION substr(size_type __pos = 0, size_type __n = npos) const noexcept(false) { __pos = std::__sv_check(size(), __pos, "basic_string_view::substr"); - const size_type __rlen = std::min(__n, _M_len - __pos); + const size_type __rlen = std::min<size_t>(__n, _M_len - __pos); return basic_string_view{_M_str + __pos, __rlen}; } |