This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
[Patch] Uglify std::copy/copy_backward helpers
- From: Paolo Carlini <pcarlini at suse dot de>
- To: libstdc++ <libstdc++ at gcc dot gnu dot org>
- Date: Sun, 18 Dec 2005 16:26:15 +0100
- Subject: [Patch] Uglify std::copy/copy_backward helpers
Hi,
long standing (HP / SGI) issue, maybe it's time to fix it ;) Tested
x86-linux.
Paolo.
/////////////////////
2005-12-18 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algobase.h (__copy_normal::copy_n): Uglify
to __copy_n.
(__copy_backward::copy_b): Likewise to __copy_b.
(__copy_backward_normal::copy_b_n): Likewise to __copy_b_n.
(copy, __copy_backward_aux, copy_backward): Adjust.
Index: stl_algobase.h
===================================================================
--- stl_algobase.h (revision 108749)
+++ stl_algobase.h (working copy)
@@ -322,7 +322,7 @@
{
template<typename _II, typename _OI>
static _OI
- copy_n(_II __first, _II __last, _OI __result)
+ __copy_n(_II __first, _II __last, _OI __result)
{ return std::__copy_aux(__first, __last, __result); }
};
@@ -331,7 +331,7 @@
{
template<typename _II, typename _OI>
static _OI
- copy_n(_II __first, _II __last, _OI __result)
+ __copy_n(_II __first, _II __last, _OI __result)
{ return std::__copy_aux(__first.base(), __last.base(), __result); }
};
@@ -340,7 +340,7 @@
{
template<typename _II, typename _OI>
static _OI
- copy_n(_II __first, _II __last, _OI __result)
+ __copy_n(_II __first, _II __last, _OI __result)
{ return _OI(std::__copy_aux(__first, __last, __result.base())); }
};
@@ -349,7 +349,7 @@
{
template<typename _II, typename _OI>
static _OI
- copy_n(_II __first, _II __last, _OI __result)
+ __copy_n(_II __first, _II __last, _OI __result)
{ return _OI(std::__copy_aux(__first.base(), __last.base(),
__result.base())); }
};
@@ -383,8 +383,8 @@
const bool __in = __is_normal_iterator<_InputIterator>::__value;
const bool __out = __is_normal_iterator<_OutputIterator>::__value;
- return std::__copy_normal<__in, __out>::copy_n(__first, __last,
- __result);
+ return std::__copy_normal<__in, __out>::__copy_n(__first, __last,
+ __result);
}
template<bool, typename>
@@ -392,7 +392,7 @@
{
template<typename _BI1, typename _BI2>
static _BI2
- copy_b(_BI1 __first, _BI1 __last, _BI2 __result)
+ __copy_b(_BI1 __first, _BI1 __last, _BI2 __result)
{
while (__first != __last)
*--__result = *--__last;
@@ -405,7 +405,7 @@
{
template<typename _BI1, typename _BI2>
static _BI2
- copy_b(_BI1 __first, _BI1 __last, _BI2 __result)
+ __copy_b(_BI1 __first, _BI1 __last, _BI2 __result)
{
typename iterator_traits<_BI1>::difference_type __n;
for (__n = __last - __first; __n > 0; --__n)
@@ -419,7 +419,7 @@
{
template<typename _Tp>
static _Tp*
- copy_b(const _Tp* __first, const _Tp* __last, _Tp* __result)
+ __copy_b(const _Tp* __first, const _Tp* __last, _Tp* __result)
{
const ptrdiff_t _Num = __last - __first;
std::memmove(__result - _Num, __first, sizeof(_Tp) * _Num);
@@ -439,8 +439,9 @@
&& __is_pointer<_BI2>::__value
&& __are_same<_ValueType1, _ValueType2>::__value);
- return std::__copy_backward<__simple, _Category>::copy_b(__first, __last,
- __result);
+ return std::__copy_backward<__simple, _Category>::__copy_b(__first,
+ __last,
+ __result);
}
template<bool, bool>
@@ -448,7 +449,7 @@
{
template<typename _BI1, typename _BI2>
static _BI2
- copy_b_n(_BI1 __first, _BI1 __last, _BI2 __result)
+ __copy_b_n(_BI1 __first, _BI1 __last, _BI2 __result)
{ return std::__copy_backward_aux(__first, __last, __result); }
};
@@ -457,7 +458,7 @@
{
template<typename _BI1, typename _BI2>
static _BI2
- copy_b_n(_BI1 __first, _BI1 __last, _BI2 __result)
+ __copy_b_n(_BI1 __first, _BI1 __last, _BI2 __result)
{ return std::__copy_backward_aux(__first.base(), __last.base(),
__result); }
};
@@ -467,7 +468,7 @@
{
template<typename _BI1, typename _BI2>
static _BI2
- copy_b_n(_BI1 __first, _BI1 __last, _BI2 __result)
+ __copy_b_n(_BI1 __first, _BI1 __last, _BI2 __result)
{ return _BI2(std::__copy_backward_aux(__first, __last,
__result.base())); }
};
@@ -477,7 +478,7 @@
{
template<typename _BI1, typename _BI2>
static _BI2
- copy_b_n(_BI1 __first, _BI1 __last, _BI2 __result)
+ __copy_b_n(_BI1 __first, _BI1 __last, _BI2 __result)
{ return _BI2(std::__copy_backward_aux(__first.base(), __last.base(),
__result.base())); }
};
@@ -513,8 +514,9 @@
const bool __bi1 = __is_normal_iterator<_BI1>::__value;
const bool __bi2 = __is_normal_iterator<_BI2>::__value;
- return std::__copy_backward_normal<__bi1, __bi2>::copy_b_n(__first, __last,
- __result);
+ return std::__copy_backward_normal<__bi1, __bi2>::__copy_b_n(__first,
+ __last,
+ __result);
}
template<bool>