mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-23 07:00:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

libstdc++: Add casts for integer-like difference type [PR107871]

Browse Source 
libstdc++-v3/ChangeLog:

	PR libstdc++/107871
	* include/std/format (_Iter_sink::_M_overflow): Add cast to
	size_t.
	(_Iter_sink<CharT, contiguous_iterator auto>::_M_make_span): Use
	typedef instead of decltype.
	* testsuite/std/format/functions/107871.cc: New test.
This commit is contained in:
Jonathan Wakely 2022-12-05 21:38:53 +00:00
parent 5329e1a8e1
commit 9cce91a63d
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/include/std/format
View File

@ -2481,12 +2481,12 @@ namespace __format
auto __s = this->_M_used();
if (_M_max < 0) // No maximum.
_M_out = ranges::copy(__s, std::move(_M_out)).out;
else if (_M_count < size_t(_M_max))
else if (_M_count < static_cast<size_t>(_M_max))
{
auto __max = _M_max - _M_count;
span<_CharT> __first;
if (__max < __s.size())
__first = __s.first(__max);
__first = __s.first(static_cast<size_t>(__max));
else
__first = __s;
_M_out = ranges::copy(__first, std::move(_M_out)).out;
@ -2564,11 +2564,11 @@ namespace __format
if (__n > 0)
{
if constexpr (!is_integral_v<decltype(__n)>
if constexpr (!is_integral_v<iter_difference_t<_OutIter>>
|| sizeof(__n) > sizeof(size_t))
{
// __int128 or __detail::__max_diff_type
auto __m = (decltype(__n))(size_t)-1;
auto __m = iter_difference_t<_OutIter>((size_t)-1);
if (__n > __m)
__n = __m;
}

14
libstdc++-v3/testsuite/std/format/functions/107871.cc Normal file
View File

@ -0,0 +1,14 @@
// { dg-options "-std=gnu++20" }
// { dg-do compile { target c++20 } }
#include <format>
struct O {
using difference_type = std::ranges::__detail::__max_diff_type;
O& operator=(const char&);
O& operator*();
O& operator++();
O& operator++(int);
};
auto str = std::format_to_n(O{}, 4, "{}", " "); // PR libstdc++/107871