Commit 55992626 by Patrick Palka

libstdc++: Whitespace and formatting adjustments

libstdc++-v3/ChangeLog:

	* include/bits/ranges_algo.h: Adjust whitespace and formatting.
	* include/bits/ranges_algobase.h: Likewise.
	* include/bits/ranges_uninitialized.h: Likewise.
parent b40c57bd
2020-02-15 Patrick Palka <ppalka@redhat.com> 2020-02-15 Patrick Palka <ppalka@redhat.com>
* include/bits/ranges_algo.h: Adjust whitespace and formatting.
* include/bits/ranges_algobase.h: Likewise.
* include/bits/ranges_uninitialized.h: Likewise.
* include/bits/ranges_algo.h: (adjacent_find, all_of, any_of, * include/bits/ranges_algo.h: (adjacent_find, all_of, any_of,
binary_search, copy_if, count, count_if, equal_range, find, find_end, binary_search, copy_if, count, count_if, equal_range, find, find_end,
find_first_of, find_if, find_if_not, for_each, generate, generate_n, find_first_of, find_if, find_if_not, for_each, generate, generate_n,
......
...@@ -79,8 +79,9 @@ namespace ranges ...@@ -79,8 +79,9 @@ namespace ranges
typename _Proj1 = identity, typename _Proj2 = identity> typename _Proj1 = identity, typename _Proj2 = identity>
requires indirectly_comparable<_Iter1, _Iter2, _Pred, _Proj1, _Proj2> requires indirectly_comparable<_Iter1, _Iter2, _Pred, _Proj1, _Proj2>
constexpr bool constexpr bool
operator()(_Iter1 __first1, _Sent1 __last1, _Iter2 __first2, _Sent2 __last2, operator()(_Iter1 __first1, _Sent1 __last1,
_Pred __pred = {}, _Proj1 __proj1 = {}, _Proj2 __proj2 = {}) const _Iter2 __first2, _Sent2 __last2, _Pred __pred = {},
_Proj1 __proj1 = {}, _Proj2 __proj2 = {}) const
{ {
// TODO: implement more specializations to at least have parity with // TODO: implement more specializations to at least have parity with
// std::equal. // std::equal.
...@@ -147,8 +148,8 @@ namespace ranges ...@@ -147,8 +148,8 @@ namespace ranges
requires indirectly_comparable<iterator_t<_Range1>, iterator_t<_Range2>, requires indirectly_comparable<iterator_t<_Range1>, iterator_t<_Range2>,
_Pred, _Proj1, _Proj2> _Pred, _Proj1, _Proj2>
constexpr bool constexpr bool
operator()(_Range1&& __r1, _Range2&& __r2, operator()(_Range1&& __r1, _Range2&& __r2, _Pred __pred = {},
_Pred __pred = {}, _Proj1 __proj1 = {}, _Proj2 __proj2 = {}) const _Proj1 __proj1 = {}, _Proj2 __proj2 = {}) const
{ {
return (*this)(ranges::begin(__r1), ranges::end(__r1), return (*this)(ranges::begin(__r1), ranges::end(__r1),
ranges::begin(__r2), ranges::end(__r2), ranges::begin(__r2), ranges::end(__r2),
...@@ -493,7 +494,8 @@ namespace ranges ...@@ -493,7 +494,8 @@ namespace ranges
template<input_iterator _Iter, weakly_incrementable _Out> template<input_iterator _Iter, weakly_incrementable _Out>
requires indirectly_copyable<_Iter, _Out> requires indirectly_copyable<_Iter, _Out>
constexpr copy_n_result<_Iter, _Out> constexpr copy_n_result<_Iter, _Out>
operator()(_Iter __first, iter_difference_t<_Iter> __n, _Out __result) const operator()(_Iter __first, iter_difference_t<_Iter> __n,
_Out __result) const
{ {
if constexpr (random_access_iterator<_Iter>) if constexpr (random_access_iterator<_Iter>)
return ranges::copy(__first, __first + __n, std::move(__result)); return ranges::copy(__first, __first + __n, std::move(__result));
...@@ -512,7 +514,8 @@ namespace ranges ...@@ -512,7 +514,8 @@ namespace ranges
{ {
template<typename _Tp, output_iterator<const _Tp&> _Out> template<typename _Tp, output_iterator<const _Tp&> _Out>
constexpr _Out constexpr _Out
operator()(_Out __first, iter_difference_t<_Out> __n, const _Tp& __value) const operator()(_Out __first, iter_difference_t<_Out> __n,
const _Tp& __value) const
{ {
// TODO: implement more specializations to be at least on par with // TODO: implement more specializations to be at least on par with
// std::fill_n // std::fill_n
......
...@@ -162,8 +162,7 @@ namespace ranges ...@@ -162,8 +162,7 @@ namespace ranges
safe_iterator_t<_Range> safe_iterator_t<_Range>
operator()(_Range&& __r) const operator()(_Range&& __r) const
{ {
return (*this)(ranges::begin(__r), return (*this)(ranges::begin(__r), ranges::end(__r));
ranges::end(__r));
} }
}; };
...@@ -175,8 +174,7 @@ namespace ranges ...@@ -175,8 +174,7 @@ namespace ranges
template<__detail::__nothrow_forward_iterator _Iter> template<__detail::__nothrow_forward_iterator _Iter>
requires default_initializable<iter_value_t<_Iter>> requires default_initializable<iter_value_t<_Iter>>
_Iter _Iter
operator()(_Iter __first, operator()(_Iter __first, iter_difference_t<_Iter> __n) const
iter_difference_t<_Iter> __n) const
{ {
using _ValueType = remove_reference_t<iter_reference_t<_Iter>>; using _ValueType = remove_reference_t<iter_reference_t<_Iter>>;
if constexpr (is_trivially_default_constructible_v<_ValueType>) if constexpr (is_trivially_default_constructible_v<_ValueType>)
...@@ -222,8 +220,7 @@ namespace ranges ...@@ -222,8 +220,7 @@ namespace ranges
safe_iterator_t<_Range> safe_iterator_t<_Range>
operator()(_Range&& __r) const operator()(_Range&& __r) const
{ {
return (*this)(ranges::begin(__r), return (*this)(ranges::begin(__r), ranges::end(__r));
ranges::end(__r));
} }
}; };
...@@ -297,10 +294,8 @@ namespace ranges ...@@ -297,10 +294,8 @@ namespace ranges
safe_iterator_t<_ORange>> safe_iterator_t<_ORange>>
operator()(_IRange&& __inr, _ORange&& __outr) const operator()(_IRange&& __inr, _ORange&& __outr) const
{ {
return (*this)(ranges::begin(__inr), return (*this)(ranges::begin(__inr), ranges::end(__inr),
ranges::end(__inr), ranges::begin(__outr), ranges::end(__outr));
ranges::begin(__outr),
ranges::end(__outr));
} }
}; };
...@@ -386,10 +381,8 @@ namespace ranges ...@@ -386,10 +381,8 @@ namespace ranges
safe_iterator_t<_ORange>> safe_iterator_t<_ORange>>
operator()(_IRange&& __inr, _ORange&& __outr) const operator()(_IRange&& __inr, _ORange&& __outr) const
{ {
return (*this)(ranges::begin(__inr), return (*this)(ranges::begin(__inr), ranges::end(__inr),
ranges::end(__inr), ranges::begin(__outr), ranges::end(__outr));
ranges::begin(__outr),
ranges::end(__outr));
} }
}; };
...@@ -460,8 +453,7 @@ namespace ranges ...@@ -460,8 +453,7 @@ namespace ranges
safe_iterator_t<_Range> safe_iterator_t<_Range>
operator()(_Range&& __r, const _Tp& __x) const operator()(_Range&& __r, const _Tp& __x) const
{ {
return (*this)(ranges::begin(__r), ranges::end(__r), return (*this)(ranges::begin(__r), ranges::end(__r), __x);
__x);
} }
}; };
...@@ -541,7 +533,9 @@ namespace ranges ...@@ -541,7 +533,9 @@ namespace ranges
requires destructible<range_value_t<_Range>> requires destructible<range_value_t<_Range>>
constexpr safe_iterator_t<_Range> constexpr safe_iterator_t<_Range>
__destroy_fn::operator()(_Range&& __r) const noexcept __destroy_fn::operator()(_Range&& __r) const noexcept
{ return (*this)(ranges::begin(__r), ranges::end(__r)); } {
return (*this)(ranges::begin(__r), ranges::end(__r));
}
struct __destroy_n_fn struct __destroy_n_fn
{ {
......
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