Commit e75ea710 by Paolo Carlini Committed by Paolo Carlini

stl_algobase.h (__copy_normal::copy_n): Uglify to __copy_n.

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.

2005-12-18  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/stl_algo.h (partial_sort_copy): Add
	_BinaryPredicateConcept<_Compare, _InputValueType, _OutputValueType>
	(merge, set_union, set_symmetric_difference): Add
	_OutputIteratorConcept<_OutputIterator, _ValueType2>.
	(binary_search): Remove redundant _BinaryPredicateConcept<_Compare,
	_ValueType, _Tp>, taken care by lower_bound.
	* include/bits/stl_algo.h: Cosmetic changes.

2005-12-18  Paolo Carlini  <pcarlini@suse.de>
	    Howard Hinnant  <hhinnant@apple.com>

	* include/bits/stl_algo.h (merge, includes, set_union,
	set_intersection, set_difference, set_symmetric_difference):
	Fix concept checks.

2005-12-18  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/stl_algo.h (partial_sort_copy, lower_bound,
	upper_bound, equal_range, binary_search): Fix concept checks.

Co-Authored-By: Howard Hinnant <hhinnant@apple.com>

From-SVN: r108758
parent 6a60530d
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.
2005-12-18 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algo.h (partial_sort_copy): Add
_BinaryPredicateConcept<_Compare, _InputValueType, _OutputValueType>
(merge, set_union, set_symmetric_difference): Add
_OutputIteratorConcept<_OutputIterator, _ValueType2>.
(binary_search): Remove redundant _BinaryPredicateConcept<_Compare,
_ValueType, _Tp>, taken care by lower_bound.
* include/bits/stl_algo.h: Cosmetic changes.
2005-12-18 Paolo Carlini <pcarlini@suse.de>
Howard Hinnant <hhinnant@apple.com>
* include/bits/stl_algo.h (merge, includes, set_union,
set_intersection, set_difference, set_symmetric_difference):
Fix concept checks.
2005-12-18 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algo.h (partial_sort_copy, lower_bound,
upper_bound, equal_range, binary_search): Fix concept checks.
2005-12-18 Benjamin Kosnik <bkoz@redhat.com>
* config/abi/post: New.
......
......@@ -322,7 +322,7 @@ namespace std
{
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 @@ namespace std
{
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 @@ namespace std
{
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 @@ namespace std
{
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 @@ namespace std
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 @@ namespace std
{
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 @@ namespace std
{
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 @@ namespace std
{
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 @@ namespace std
&& __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 @@ namespace std
{
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 @@ namespace std
{
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 @@ namespace std
{
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 @@ namespace std
{
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 @@ namespace std
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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment