[PATCH 3/3] libstdc++: Post-conversion whitespace and formatting adjustments

2020-02-14 Thread Patrick Palka 
libstdc++-v3/ChangeLog:

* include/bits/ranges_algo.h: Adjust whitespace and formatting.
* include/bits/ranges_algobase.h: Likewise.
* include/bits/ranges_uninitialized.h: Likewise.
---
 libstdc++-v3/include/bits/ranges_algo.h   | 631 ++
 libstdc++-v3/include/bits/ranges_algobase.h   |  39 +-
 .../include/bits/ranges_uninitialized.h   |  38 +-
 3 files changed, 376 insertions(+), 332 deletions(-)

diff --git a/libstdc++-v3/include/bits/ranges_algo.h 
b/libstdc++-v3/include/bits/ranges_algo.h
index af6d1722998..7f8f0fb964b 100644
--- a/libstdc++-v3/include/bits/ranges_algo.h
+++ b/libstdc++-v3/include/bits/ranges_algo.h
@@ -73,7 +73,8 @@ namespace ranges
 typename _Proj = identity,
 indirect_unary_predicate> _Pred>
   constexpr bool
-  operator()(_Iter __first, _Sent __last, _Pred __pred, _Proj __proj = {}) 
const
+  operator()(_Iter __first, _Sent __last,
+_Pred __pred, _Proj __proj = {}) const
   {
for (; __first != __last; ++__first)
  if (!(bool)std::__invoke(__pred, std::__invoke(__proj, *__first)))
@@ -82,7 +83,8 @@ namespace ranges
   }
 
 template, _Proj>> 
_Pred>
+indirect_unary_predicate, _Proj>>
+  _Pred>
   constexpr bool
   operator()(_Range&& __r, _Pred __pred, _Proj __proj = {}) const
   {
@@ -99,7 +101,8 @@ namespace ranges
 typename _Proj = identity,
 indirect_unary_predicate> _Pred>
   constexpr bool
-  operator()(_Iter __first, _Sent __last, _Pred __pred, _Proj __proj = {}) 
const
+  operator()(_Iter __first, _Sent __last,
+_Pred __pred, _Proj __proj = {}) const
   {
for (; __first != __last; ++__first)
  if (std::__invoke(__pred, std::__invoke(__proj, *__first)))
@@ -108,12 +111,13 @@ namespace ranges
   }
 
 template, _Proj>> 
_Pred>
+indirect_unary_predicate, _Proj>>
+  _Pred>
   constexpr bool
   operator()(_Range&& __r, _Pred __pred, _Proj __proj = {}) const
   {
return (*this)(ranges::begin(__r), ranges::end(__r),
- std::move(__pred), std::move(__proj));
+  std::move(__pred), std::move(__proj));
   }
   };
 
@@ -125,7 +129,8 @@ namespace ranges
 typename _Proj = identity,
 indirect_unary_predicate> _Pred>
   constexpr bool
-  operator()(_Iter __first, _Sent __last, _Pred __pred, _Proj __proj = {}) 
const
+  operator()(_Iter __first, _Sent __last,
+_Pred __pred, _Proj __proj = {}) const
   {
for (; __first != __last; ++__first)
  if (std::__invoke(__pred, std::__invoke(__proj, *__first)))
@@ -134,7 +139,8 @@ namespace ranges
   }
 
 template, _Proj>> 
_Pred>
+indirect_unary_predicate, _Proj>>
+  _Pred>
   constexpr bool
   operator()(_Range&& __r, _Pred __pred, _Proj __proj = {}) const
   {
@@ -183,7 +189,7 @@ namespace ranges
   operator()(_Range&& __r, _Fun __f, _Proj __proj = {}) const
   {
return (*this)(ranges::begin(__r), ranges::end(__r),
-   std::move(__f), std::move(__proj));
+  std::move(__f), std::move(__proj));
   }
   };
 
@@ -196,7 +202,8 @@ namespace ranges
   requires indirect_binary_predicate, const _Tp*>
   constexpr _Iter
-  operator()(_Iter __first, _Sent __last, const _Tp& __value, _Proj __proj 
= {}) const
+  operator()(_Iter __first, _Sent __last,
+const _Tp& __value, _Proj __proj = {}) const
   {
while (__first != __last
&& !(std::__invoke(__proj, *__first) == __value))
@@ -211,8 +218,8 @@ namespace ranges
   constexpr safe_iterator_t<_Range>
   operator()(_Range&& __r, const _Tp& __value, _Proj __proj = {}) const
   {
-   return (*this)(ranges::begin(__r), ranges::end(__r), __value,
-   std::move(__proj));
+   return (*this)(ranges::begin(__r), ranges::end(__r),
+  __value, std::move(__proj));
   }
   };
 
@@ -224,7 +231,8 @@ namespace ranges
 typename _Proj = identity,
 indirect_unary_predicate> _Pred>
   constexpr _Iter
-  operator()(_Iter __first, _Sent __last, _Pred __pred, _Proj __proj = {}) 
const
+  operator()(_Iter __first, _Sent __last,
+_Pred __pred, _Proj __proj = {}) const
   {
while (__first != __last
&& !(bool)std::__invoke(__pred, std::__invoke(__proj, *__first)))
@@ -239,7 +247,7 @@ namespace ranges
   operator()(_Range&& __r, _Pred __pred, _Proj __proj = {}) const
   {
return (*this)(ranges::begin(__r), ranges::end(__r),
-  std::move(__pred), std::move(__proj));
+  std::move(__pred), std::move(__proj));
   }
   };
 
@@ -251,7 +259,8 @@ namespace ranges

Re: [PATCH 3/3] libstdc++: Post-conversion whitespace and formatting adjustments

2020-02-14 Thread Jonathan Wakely 

On 14/02/20 10:35 -0500, Patrick Palka wrote:

libstdc++-v3/ChangeLog:

* include/bits/ranges_algo.h: Adjust whitespace and formatting.
* include/bits/ranges_algobase.h: Likewise.
* include/bits/ranges_uninitialized.h: Likewise.


OK for master, thanks!