Re: [PATCH] Extend std::copy/std::copy_n char* overload to deque iterator
On 24/05/20 15:43 +0200, François Dumont via Libstdc++ wrote:
Now tested in C++98 mode, there was indeed a small problem.
I even wonder if I shouldn't have extend the std::copy overload to any
call with deque iterator as the output so that it is transform into an
output to pointer.
Ok to commit ?
--- a/libstdc++-v3/include/debug/safe_iterator.tcc
+++ b/libstdc++-v3/include/debug/safe_iterator.tcc
@@ -234,6 +234,12 @@ namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
+ template
+_Ite
+__niter_base(const ::__gnu_debug::_Safe_iterator<_Ite, _Seq,
+std::random_access_iterator_tag>& __it)
+{ return __it.base(); }
+
I was going to ask if there's a reason this uses "_Ite" and not
"_Iter", but I see we already have several uses of that.
Thy all seem to be introduced by you though :-)
We definitely have a lot more "_Iter" uses though:
$ git grep -w _Ite -- include/ | wc -l
46
$ git grep -w _Iter -- include/ | wc -l
835
When I see "Ite" it looks to me as though it should rhyme with "sight"
or "white", rather than "Iter" which rhymes with "bitter" (and so is
the start of "iterator").
Leave it as _Ite for now, I might go through and change every _Ite to
_Iter later.
OK for master, thanks.
Re: [PATCH] Extend std::copy/std::copy_n char* overload to deque iterator
Hi Any feedback regarding this patch ? François On 26/05/20 1:45 pm, François Dumont wrote: On 24/05/20 3:43 pm, François Dumont wrote: Now tested in C++98 mode, there was indeed a small problem. I even wonder if I shouldn't have extend the std::copy overload to any call with deque iterator as the output so that it is transform into an output to pointer. Ignore this remark, I had a look and we already have an overload that does that. It is limited to RA iterators and is just fine. Ok to commit ? François On 23/05/20 6:37 pm, Jonathan Wakely wrote: On 22/05/20 22:57 +0200, François Dumont via Libstdc++ wrote: On 21/05/20 2:17 pm, Jonathan Wakely wrote: Why is the optimization not done for C++03 mode? I did it this way because the new std::copy overload rely on std::copy_n implementation details which is a C++11 algo. It looks like the uses of 'auto' can be reaplced easily, and __enable_if_t<> can be replaced with __gnu_cxx::__enable_if<>::__type. But yes, we can indeed provide those implementation details in pre-C++11. This is what I've done in this new version. Tested under Linux x86_64 in default c++ mode. I tried to use CXXFLAGS=-std=c++03 but it doesn't seem to work even if I do see the option in build logs. I remember you adivised a different approach, can you tell me again ? See the documentation: https://gcc.gnu.org/onlinedocs/libstdc++/manual/test.html#test.run.permutations
Re: [PATCH] Extend std::copy/std::copy_n char* overload to deque iterator
On 24/05/20 3:43 pm, François Dumont wrote: Now tested in C++98 mode, there was indeed a small problem. I even wonder if I shouldn't have extend the std::copy overload to any call with deque iterator as the output so that it is transform into an output to pointer. Ignore this remark, I had a look and we already have an overload that does that. It is limited to RA iterators and is just fine. Ok to commit ? François On 23/05/20 6:37 pm, Jonathan Wakely wrote: On 22/05/20 22:57 +0200, François Dumont via Libstdc++ wrote: On 21/05/20 2:17 pm, Jonathan Wakely wrote: Why is the optimization not done for C++03 mode? I did it this way because the new std::copy overload rely on std::copy_n implementation details which is a C++11 algo. It looks like the uses of 'auto' can be reaplced easily, and __enable_if_t<> can be replaced with __gnu_cxx::__enable_if<>::__type. But yes, we can indeed provide those implementation details in pre-C++11. This is what I've done in this new version. Tested under Linux x86_64 in default c++ mode. I tried to use CXXFLAGS=-std=c++03 but it doesn't seem to work even if I do see the option in build logs. I remember you adivised a different approach, can you tell me again ? See the documentation: https://gcc.gnu.org/onlinedocs/libstdc++/manual/test.html#test.run.permutations
Re: [PATCH] Extend std::copy/std::copy_n char* overload to deque iterator
Now tested in C++98 mode, there was indeed a small problem.
I even wonder if I shouldn't have extend the std::copy overload to any
call with deque iterator as the output so that it is transform into an
output to pointer.
Ok to commit ?
François
On 23/05/20 6:37 pm, Jonathan Wakely wrote:
On 22/05/20 22:57 +0200, François Dumont via Libstdc++ wrote:
On 21/05/20 2:17 pm, Jonathan Wakely wrote:
Why is the optimization not done for C++03 mode?
I did it this way because the new std::copy overload rely on
std::copy_n implementation details which is a C++11 algo.
It looks like the uses of 'auto' can be reaplced easily, and
__enable_if_t<> can be replaced with __gnu_cxx::__enable_if<>::__type.
But yes, we can indeed provide those implementation details in
pre-C++11.
This is what I've done in this new version.
Tested under Linux x86_64 in default c++ mode.
I tried to use CXXFLAGS=-std=c++03 but it doesn't seem to work even
if I do see the option in build logs. I remember you adivised a
different approach, can you tell me again ?
See the documentation:
https://gcc.gnu.org/onlinedocs/libstdc++/manual/test.html#test.run.permutations
diff --git a/libstdc++-v3/include/bits/deque.tcc b/libstdc++-v3/include/bits/deque.tcc
index e773f32b256..d7dbe64f3e1 100644
--- a/libstdc++-v3/include/bits/deque.tcc
+++ b/libstdc++-v3/include/bits/deque.tcc
@@ -1065,6 +1065,57 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
return __result;
}
+ template
+typename __gnu_cxx::__enable_if<
+ __is_char<_CharT>::__value,
+ _GLIBCXX_STD_C::_Deque_iterator<_CharT, _CharT&, _CharT*> >::__type
+__copy_move_a2(
+ istreambuf_iterator<_CharT, char_traits<_CharT> > __first,
+ istreambuf_iterator<_CharT, char_traits<_CharT> > __last,
+ _GLIBCXX_STD_C::_Deque_iterator<_CharT, _CharT&, _CharT*> __result)
+{
+ if (__first == __last)
+ return __result;
+
+ for (;;)
+ {
+ const std::ptrdiff_t __len = __result._M_last - __result._M_cur;
+ const std::ptrdiff_t __nb
+ = std::__copy_n_a(__first, __len, __result._M_cur, false)
+ - __result._M_cur;
+ __result += __nb;
+
+ if (__nb != __len)
+ break;
+ }
+
+ return __result;
+}
+
+ template
+typename __gnu_cxx::__enable_if<
+ __is_char<_CharT>::__value,
+ _GLIBCXX_STD_C::_Deque_iterator<_CharT, _CharT&, _CharT*> >::__type
+__copy_n_a(
+ istreambuf_iterator<_CharT, char_traits<_CharT> > __it, _Size __size,
+ _GLIBCXX_STD_C::_Deque_iterator<_CharT, _CharT&, _CharT*> __result,
+ bool __strict)
+{
+ if (__size == 0)
+ return __result;
+
+ do
+ {
+ const _Size __len
+ = std::min<_Size>(__result._M_last - __result._M_cur, __size);
+ std::__copy_n_a(__it, __len, __result._M_cur, __strict);
+ __result += __len;
+ __size -= __len;
+ }
+ while (__size != 0);
+ return __result;
+}
+
template
_OI
diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h
index 932ece55529..70d8232aece 100644
--- a/libstdc++-v3/include/bits/stl_algo.h
+++ b/libstdc++-v3/include/bits/stl_algo.h
@@ -705,31 +705,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __result;
}
- template
-_GLIBCXX20_CONSTEXPR
-_OutputIterator
-__copy_n_a(_InputIterator __first, _Size __n, _OutputIterator __result)
-{
- if (__n > 0)
- {
- while (true)
- {
- *__result = *__first;
- ++__result;
- if (--__n > 0)
- ++__first;
- else
- break;
- }
- }
- return __result;
-}
-
- template
-__enable_if_t<__is_char<_CharT>::__value, _CharT*>
-__copy_n_a(istreambuf_iterator<_CharT, char_traits<_CharT>>,
- _Size, _CharT*);
-
template
_GLIBCXX20_CONSTEXPR
_OutputIterator
@@ -738,7 +713,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{
return std::__niter_wrap(__result,
__copy_n_a(__first, __n,
- std::__niter_base(__result)));
+ std::__niter_base(__result), true));
}
template::value)
{ return __it; }
+ template
+_Ite
+__niter_base(const ::__gnu_debug::_Safe_iterator<_Ite, _Seq,
+ std::random_access_iterator_tag>&);
+
// Reverse the __niter_base transformation to get a
// __normal_iterator back again (this assumes that __normal_iterator
// is only used to wrap random access iterators, like pointers).
@@ -466,6 +471,15 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
__copy_move_a2(istreambuf_iterator<_CharT, char_traits<_CharT> >,
istreambuf_iterator<_CharT, char_traits<_CharT> >, _CharT*);
+ template
+typename __gnu_cxx::__enable_if<
+ __is_char<_CharT>::__value,
+ _GLIBCXX_STD_C::_Deque_iterator<_CharT, _CharT&, _CharT*> >::__type
+__copy_move_a2(
+ istreambuf_iterator<_CharT, char_traits<_CharT> >,
+ istreambuf_iterator<_CharT, char_traits<_CharT> >,
+ _GLIBCXX_STD_C::_Deque_iterator<_CharT, _CharT&, _CharT*>);
+
template
_GLIBCXX20_CONSTEXPR
inline _OI
@@ -539,6 +553,41 @@
Re: [PATCH] Extend std::copy/std::copy_n char* overload to deque iterator
On 22/05/20 22:57 +0200, François Dumont via Libstdc++ wrote: On 21/05/20 2:17 pm, Jonathan Wakely wrote: Why is the optimization not done for C++03 mode? I did it this way because the new std::copy overload rely on std::copy_n implementation details which is a C++11 algo. It looks like the uses of 'auto' can be reaplced easily, and __enable_if_t<> can be replaced with __gnu_cxx::__enable_if<>::__type. But yes, we can indeed provide those implementation details in pre-C++11. This is what I've done in this new version. Tested under Linux x86_64 in default c++ mode. I tried to use CXXFLAGS=-std=c++03 but it doesn't seem to work even if I do see the option in build logs. I remember you adivised a different approach, can you tell me again ? See the documentation: https://gcc.gnu.org/onlinedocs/libstdc++/manual/test.html#test.run.permutations
Re: [PATCH] Extend std::copy/std::copy_n char* overload to deque iterator
On 22/05/20 10:57 pm, François Dumont wrote: On 21/05/20 2:17 pm, Jonathan Wakely wrote: Why is the optimization not done for C++03 mode? I did it this way because the new std::copy overload rely on std::copy_n implementation details which is a C++11 algo. It looks like the uses of 'auto' can be reaplced easily, and __enable_if_t<> can be replaced with __gnu_cxx::__enable_if<>::__type. But yes, we can indeed provide those implementation details in pre-C++11. This is what I've done in this new version. Note that I expose all __copy_n_a overloads in stl_algobase.h and not only the overload needed for the std::copy. Let me know if you prefer to limit it. Tested under Linux x86_64 in default c++ mode. I tried to use CXXFLAGS=-std=c++03 but it doesn't seem to work even if I do see the option in build logs. I remember you adivised a different approach, can you tell me again ? François I forgot to mention that "doesn't seem to work" above means that all C++11 or higher tests are reported as FAIL in this case. I was expecting an UNSUPPORTED.
Re: [PATCH] Extend std::copy/std::copy_n char* overload to deque iterator
On 21/05/20 2:17 pm, Jonathan Wakely wrote:
Why is the optimization not done for C++03 mode?
I did it this way because the new std::copy overload rely on std::copy_n
implementation details which is a C++11 algo.
It looks like the uses of 'auto' can be reaplced easily, and
__enable_if_t<> can be replaced with __gnu_cxx::__enable_if<>::__type.
But yes, we can indeed provide those implementation details in pre-C++11.
This is what I've done in this new version.
Tested under Linux x86_64 in default c++ mode.
I tried to use CXXFLAGS=-std=c++03 but it doesn't seem to work even if I
do see the option in build logs. I remember you adivised a different
approach, can you tell me again ?
François
diff --git a/libstdc++-v3/include/bits/deque.tcc b/libstdc++-v3/include/bits/deque.tcc
index e773f32b256..66ecd9da2f3 100644
--- a/libstdc++-v3/include/bits/deque.tcc
+++ b/libstdc++-v3/include/bits/deque.tcc
@@ -1065,6 +1065,57 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
return __result;
}
+ template
+typename __gnu_cxx::__enable_if<
+ __is_char<_CharT>::__value,
+ _GLIBCXX_STD_C::_Deque_iterator<_CharT, _CharT&, _CharT*> >::__type
+__copy_move_a2(
+ istreambuf_iterator<_CharT, char_traits<_CharT> > __first,
+ istreambuf_iterator<_CharT, char_traits<_CharT> > __last,
+ _GLIBCXX_STD_C::_Deque_iterator<_CharT, _CharT&, _CharT*> __result)
+{
+ if (__first == __last)
+ return __result;
+
+ for (;;)
+ {
+ const std::ptrdiff_t __len = __result._M_last - __result._M_cur;
+ const std::ptrdiff_t __nb
+ = std::__copy_n_a(__first, __len, __result._M_cur, false)
+ - __result._M_cur;
+ __result += __nb;
+
+ if (__nb != __len)
+ break;
+ }
+
+ return __result;
+}
+
+ template
+typename __gnu_cxx::__enable_if<
+ __is_char<_CharT>::__value,
+ _GLIBCXX_STD_C::_Deque_iterator<_CharT, _CharT&, _CharT*> >::__type
+__copy_n_a(
+ istreambuf_iterator<_CharT, char_traits<_CharT>> __it, _Size __size,
+ _GLIBCXX_STD_C::_Deque_iterator<_CharT, _CharT&, _CharT*> __result,
+ bool __strict)
+{
+ if (__size == 0)
+ return __result;
+
+ do
+ {
+ const _Size __len
+ = std::min<_Size>(__result._M_last - __result._M_cur, __size);
+ std::__copy_n_a(__it, __len, __result._M_cur, __strict);
+ __result += __len;
+ __size -= __len;
+ }
+ while (__size != 0);
+ return __result;
+}
+
template
_OI
diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h
index 932ece55529..70d8232aece 100644
--- a/libstdc++-v3/include/bits/stl_algo.h
+++ b/libstdc++-v3/include/bits/stl_algo.h
@@ -705,31 +705,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __result;
}
- template
-_GLIBCXX20_CONSTEXPR
-_OutputIterator
-__copy_n_a(_InputIterator __first, _Size __n, _OutputIterator __result)
-{
- if (__n > 0)
- {
- while (true)
- {
- *__result = *__first;
- ++__result;
- if (--__n > 0)
- ++__first;
- else
- break;
- }
- }
- return __result;
-}
-
- template
-__enable_if_t<__is_char<_CharT>::__value, _CharT*>
-__copy_n_a(istreambuf_iterator<_CharT, char_traits<_CharT>>,
- _Size, _CharT*);
-
template
_GLIBCXX20_CONSTEXPR
_OutputIterator
@@ -738,7 +713,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{
return std::__niter_wrap(__result,
__copy_n_a(__first, __n,
- std::__niter_base(__result)));
+ std::__niter_base(__result), true));
}
template::value)
{ return __it; }
+ template
+_Ite
+__niter_base(const ::__gnu_debug::_Safe_iterator<_Ite, _Seq,
+ std::random_access_iterator_tag>&);
+
// Reverse the __niter_base transformation to get a
// __normal_iterator back again (this assumes that __normal_iterator
// is only used to wrap random access iterators, like pointers).
@@ -466,6 +471,15 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
__copy_move_a2(istreambuf_iterator<_CharT, char_traits<_CharT> >,
istreambuf_iterator<_CharT, char_traits<_CharT> >, _CharT*);
+ template
+typename __gnu_cxx::__enable_if<
+ __is_char<_CharT>::__value,
+ _GLIBCXX_STD_C::_Deque_iterator<_CharT, _CharT&, _CharT*> >::__type
+__copy_move_a2(
+ istreambuf_iterator<_CharT, char_traits<_CharT> >,
+ istreambuf_iterator<_CharT, char_traits<_CharT> >,
+ _GLIBCXX_STD_C::_Deque_iterator<_CharT, _CharT&, _CharT*>);
+
template
_GLIBCXX20_CONSTEXPR
inline _OI
@@ -539,6 +553,41 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
const ::__gnu_debug::_Safe_iterator<_IIte, _ISeq, _ICat>&,
const ::__gnu_debug::_Safe_iterator<_OIte, _OSeq, _OCat>&);
+ template
+_GLIBCXX20_CONSTEXPR
+_OutputIterator
+__copy_n_a(_InputIterator __first, _Size __n, _OutputIterator __result,
+ bool)
+{
+ if (__n > 0)
+ {
+ while (true)
+ {
+ *__result = *__first;
+ ++__result;
+ if (--__n > 0)
+ ++__first;
+
Re: [PATCH] Extend std::copy/std::copy_n char* overload to deque iterator
On 07/05/20 09:12 +0200, François Dumont via Libstdc++ wrote:    This patch purpose is to make sure that existing std::copy/std::copy_n overloads for char* will also be used for std::deque iterators when dealing with istreambuf_iterator. It also make sure that it still works when _GLIBCXX_DEBUG is activated.    * include/bits/stl_algo.h (__copy_n_a): Move to ...    * include/bits/stl_algobase.h (__copy_n_a): ...here. Add __strict    parameter.    (__niter_base(const _Safe_iterator<_Ite, _Seq,    random_access_iterator_tag>&)): New declaration.    (__copy_move_a2(istreambuf_iterator<>, istreambuf_iterator<>,    _Deque_iterator<>)): New declaration.    (__copy_n_a(istreambuf_iterator<>, _Size, _Deque_iterator<>, bool)):    New declaration.    * include/bits/deque.tcc    (__copy_move_a2(istreambuf_iterator<>, istreambuf_iterator<>,    _Deque_iterator<>)): Add definition.    (__copy_n_a(istreambuf_iterator<>, _Size, _Deque_iterator<>, bool)):    Add definition.    * include/bits/streambuf_iterator.h    (__copy_n_a(istreambuf_iterator<>, _Size, _CharT*, bool)): Adapt    definition.    * include/debug/safe_iterator.tcc (__niter_base): Add definition.    * testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc (test03):    New.    * testsuite/25_algorithms/copy/streambuf_iterators/char/debug/    deque_neg.cc: New.    * testsuite/25_algorithms/copy_n/debug/istreambuf_ite_deque_neg.cc:    New.    * testsuite/25_algorithms/copy_n/istreambuf_iterator/2.cc: New.    * testsuite/25_algorithms/copy_n/istreambuf_iterator/deque.cc: New. Already tested for a while on Linux x64 normal and debug modes but I am currently rebuilding everything and will commit only once all succeeded again. Ok ? François diff --git a/libstdc++-v3/include/bits/deque.tcc b/libstdc++-v3/include/bits/deque.tcc index e773f32b256..45207066c48 100644 --- a/libstdc++-v3/include/bits/deque.tcc +++ b/libstdc++-v3/include/bits/deque.tcc @@ -1065,6 +1065,57 @@ _GLIBCXX_END_NAMESPACE_CONTAINER return __result; } +#if __cplusplus >= 201103L Why is the optimization not done for C++03 mode? It looks like the uses of 'auto' can be reaplced easily, and __enable_if_t<> can be replaced with __gnu_cxx::__enable_if<>::__type.
Re: [PATCH] Extend std::copy/std::copy_n char* overload to deque iterator
No chance to review this ? On 07/05/20 9:12 am, François Dumont wrote: This patch purpose is to make sure that existing std::copy/std::copy_n overloads for char* will also be used for std::deque iterators when dealing with istreambuf_iterator. It also make sure that it still works when _GLIBCXX_DEBUG is activated. * include/bits/stl_algo.h (__copy_n_a): Move to ... * include/bits/stl_algobase.h (__copy_n_a): ...here. Add __strict parameter. (__niter_base(const _Safe_iterator<_Ite, _Seq, random_access_iterator_tag>&)): New declaration. (__copy_move_a2(istreambuf_iterator<>, istreambuf_iterator<>, _Deque_iterator<>)): New declaration. (__copy_n_a(istreambuf_iterator<>, _Size, _Deque_iterator<>, bool)): New declaration. * include/bits/deque.tcc (__copy_move_a2(istreambuf_iterator<>, istreambuf_iterator<>, _Deque_iterator<>)): Add definition. (__copy_n_a(istreambuf_iterator<>, _Size, _Deque_iterator<>, bool)): Add definition. * include/bits/streambuf_iterator.h (__copy_n_a(istreambuf_iterator<>, _Size, _CharT*, bool)): Adapt definition. * include/debug/safe_iterator.tcc (__niter_base): Add definition. * testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc (test03): New. * testsuite/25_algorithms/copy/streambuf_iterators/char/debug/ deque_neg.cc: New. * testsuite/25_algorithms/copy_n/debug/istreambuf_ite_deque_neg.cc: New. * testsuite/25_algorithms/copy_n/istreambuf_iterator/2.cc: New. * testsuite/25_algorithms/copy_n/istreambuf_iterator/deque.cc: New. Already tested for a while on Linux x64 normal and debug modes but I am currently rebuilding everything and will commit only once all succeeded again. Ok ? François
Re: [PATCH] Extend std::copy/std::copy_n char* overload to deque iterator
Now fully tested, ok to commit ? On 07/05/20 9:12 am, François Dumont wrote: This patch purpose is to make sure that existing std::copy/std::copy_n overloads for char* will also be used for std::deque iterators when dealing with istreambuf_iterator. It also make sure that it still works when _GLIBCXX_DEBUG is activated. * include/bits/stl_algo.h (__copy_n_a): Move ... * include/bits/stl_algobase.h (__copy_n_a): ...here. Add __strict parameter. (__niter_base(const _Safe_iterator<_Ite, _Seq, random_access_iterator_tag>&)): New declaration. (__copy_move_a2(istreambuf_iterator<>, istreambuf_iterator<>, _Deque_iterator<>)): New declaration. (__copy_n_a(istreambuf_iterator<>, _Size, _Deque_iterator<>, bool)): New declaration. * include/bits/deque.tcc (__copy_move_a2(istreambuf_iterator<>, istreambuf_iterator<>, _Deque_iterator<>)): Add definition. (__copy_n_a(istreambuf_iterator<>, _Size, _Deque_iterator<>, bool)): Add definition. * include/bits/streambuf_iterator.h (__copy_n_a(istreambuf_iterator<>, _Size, _CharT*, bool)): Adapt definition. * include/debug/safe_iterator.tcc (__niter_base): Add definition. * testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc (test03): New. * testsuite/25_algorithms/copy/streambuf_iterators/char/debug/ deque_neg.cc: New. * testsuite/25_algorithms/copy_n/debug/istreambuf_ite_deque_neg.cc: New. * testsuite/25_algorithms/copy_n/istreambuf_iterator/2.cc: New. * testsuite/25_algorithms/copy_n/istreambuf_iterator/deque.cc: New. Already tested for a while on Linux x64 normal and debug modes but I am currently rebuilding everything and will commit only once all succeeded again. Ok ? François
[PATCH] Extend std::copy/std::copy_n char* overload to deque iterator
This patch purpose is to make sure that existing
std::copy/std::copy_n overloads for char* will also be used for
std::deque iterators when dealing with istreambuf_iterator. It
also make sure that it still works when _GLIBCXX_DEBUG is activated.
* include/bits/stl_algo.h (__copy_n_a): Move to ...
* include/bits/stl_algobase.h (__copy_n_a): ...here. Add __strict
parameter.
(__niter_base(const _Safe_iterator<_Ite, _Seq,
random_access_iterator_tag>&)): New declaration.
(__copy_move_a2(istreambuf_iterator<>, istreambuf_iterator<>,
_Deque_iterator<>)): New declaration.
(__copy_n_a(istreambuf_iterator<>, _Size, _Deque_iterator<>, bool)):
New declaration.
* include/bits/deque.tcc
(__copy_move_a2(istreambuf_iterator<>, istreambuf_iterator<>,
_Deque_iterator<>)): Add definition.
(__copy_n_a(istreambuf_iterator<>, _Size, _Deque_iterator<>, bool)):
Add definition.
* include/bits/streambuf_iterator.h
(__copy_n_a(istreambuf_iterator<>, _Size, _CharT*, bool)): Adapt
definition.
* include/debug/safe_iterator.tcc (__niter_base): Add definition.
* testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc (test03):
New.
* testsuite/25_algorithms/copy/streambuf_iterators/char/debug/
deque_neg.cc: New.
* testsuite/25_algorithms/copy_n/debug/istreambuf_ite_deque_neg.cc:
New.
* testsuite/25_algorithms/copy_n/istreambuf_iterator/2.cc: New.
* testsuite/25_algorithms/copy_n/istreambuf_iterator/deque.cc: New.
Already tested for a while on Linux x64 normal and debug modes but I am
currently rebuilding everything and will commit only once all succeeded
again.
Ok ?
François
diff --git a/libstdc++-v3/include/bits/deque.tcc b/libstdc++-v3/include/bits/deque.tcc
index e773f32b256..45207066c48 100644
--- a/libstdc++-v3/include/bits/deque.tcc
+++ b/libstdc++-v3/include/bits/deque.tcc
@@ -1065,6 +1065,57 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
return __result;
}
+#if __cplusplus >= 201103L
+ template
+__enable_if_t<__is_char<_CharT>::__value,
+ _GLIBCXX_STD_C::_Deque_iterator<_CharT, _CharT&, _CharT*>>
+__copy_move_a2(
+ istreambuf_iterator<_CharT, char_traits<_CharT> > __first,
+ istreambuf_iterator<_CharT, char_traits<_CharT> > __last,
+ _GLIBCXX_STD_C::_Deque_iterator<_CharT, _CharT&, _CharT*> __result)
+{
+ if (__first == __last)
+ return __result;
+
+ for (;;)
+ {
+ const auto __len = __result._M_last - __result._M_cur;
+ const auto __nb
+ = std::__copy_n_a(__first, __len, __result._M_cur, false)
+ - __result._M_cur;
+ __result += __nb;
+
+ if (__nb != __len)
+ break;
+ }
+
+ return __result;
+}
+
+ template
+__enable_if_t<__is_char<_CharT>::__value,
+ _GLIBCXX_STD_C::_Deque_iterator<_CharT, _CharT&, _CharT*>>
+__copy_n_a(
+ istreambuf_iterator<_CharT, char_traits<_CharT>> __it, _Size __size,
+ _GLIBCXX_STD_C::_Deque_iterator<_CharT, _CharT&, _CharT*> __result,
+ bool __strict)
+{
+ if (__size == 0)
+ return __result;
+
+ do
+ {
+ const auto __len = std::min<_Size>(__result._M_last - __result._M_cur,
+ __size);
+ std::__copy_n_a(__it, __len, __result._M_cur, __strict);
+ __result += __len;
+ __size -= __len;
+ }
+ while (__size != 0);
+ return __result;
+}
+#endif
+
template
_OI
diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h
index 932ece55529..70d8232aece 100644
--- a/libstdc++-v3/include/bits/stl_algo.h
+++ b/libstdc++-v3/include/bits/stl_algo.h
@@ -705,31 +705,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __result;
}
- template
-_GLIBCXX20_CONSTEXPR
-_OutputIterator
-__copy_n_a(_InputIterator __first, _Size __n, _OutputIterator __result)
-{
- if (__n > 0)
- {
- while (true)
- {
- *__result = *__first;
- ++__result;
- if (--__n > 0)
- ++__first;
- else
- break;
- }
- }
- return __result;
-}
-
- template
-__enable_if_t<__is_char<_CharT>::__value, _CharT*>
-__copy_n_a(istreambuf_iterator<_CharT, char_traits<_CharT>>,
- _Size, _CharT*);
-
template
_GLIBCXX20_CONSTEXPR
_OutputIterator
@@ -738,7 +713,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{
return std::__niter_wrap(__result,
__copy_n_a(__first, __n,
- std::__niter_base(__result)));
+ std::__niter_base(__result), true));
}
template::value)
{ return __it; }
+ template
+_Ite
+__niter_base(const ::__gnu_debug::_Safe_iterator<_Ite, _Seq,
+ std::random_access_iterator_tag>&);
+
// Reverse the __niter_base transformation to get a
// __normal_iterator back again (this assumes that __normal_iterator
// is only used to wrap random access iterators, like pointers).
@@ -466,6 +471,16 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
__copy_move_a2(istreambuf_iterator<_CharT, char_traits<_CharT> >,
istreambuf_iterator<_CharT,
