OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libstdc++: Simplify std::basic_regex::assign

Browse Source 
We know that if __is_contiguous_iterator is true then we have a pointer
or a __normal_iterator that wraps a pointer, so we don't need to use
std::__to_address.

libstdc++-v3/ChangeLog:

	* include/bits/regex.h (basic_regex::assign(Iter, Iter)): Avoid
	std::__to_address by using poitner directly or using base()
	member of __normal_iterator.
This commit is contained in:
Jonathan Wakely 2021-10-11 17:19:43 +01:00
parent 45ba5426c1
commit 247bac507e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libstdc++-v3/include/bits/regex.h
View File

@ -682,15 +682,16 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
assign(_InputIterator __first, _InputIterator __last,
flag_type __flags = ECMAScript)
{
#if __cplusplus >= 201703L
#if __cpp_if_constexpr >= 201606L
using _ValT = typename iterator_traits<_InputIterator>::value_type;
if constexpr (__detail::__is_contiguous_iter<_InputIterator>::value
&& is_same_v<_ValT, value_type>)
{
__glibcxx_requires_valid_range(__first, __last);
const auto __len = __last - __first;
const _Ch_type* __p = std::__to_address(__first);
_M_compile(__p, __p + __len, __flags);
if constexpr (is_pointer_v<_InputIterator>)
_M_compile(__first, __last, __flags);
else // __normal_iterator<_T*, C>
_M_compile(__first.base(), __last.base(), __flags);
}
else
#endif