Second attempt to suit clang-format 10

kjellahl · kjellahl · commit a6d0d6fac285 · 2021-12-23T13:14:16.000+01:00
Irritating that different versions of clang-format don't agree on what's
an acceptable format, and that clang-format 10 is not easily installable
on Ubuntu 21.10.
diff --git a/sigc++/functors/mem_fun.h b/sigc++/functors/mem_fun.h
@@ -187,8 +187,7 @@ struct visitor<bound_mem_functor<T_func, T_arg...>>
  * @ingroup mem_fun
  */
 template<typename T_return, typename T_obj, typename... T_arg>
-inline decltype(auto)
-mem_fun(T_return (T_obj::*func)(T_arg...))
+inline decltype(auto) mem_fun(T_return (T_obj::*func)(T_arg...))
 {
   return mem_functor<T_return (T_obj::*)(T_arg...), T_arg...>(func);
 }
@@ -213,8 +212,7 @@ mem_fun(T_return (T_obj::*func)(T_arg...) const)
  * @ingroup mem_fun
  */
 template<typename T_return, typename T_obj, typename... T_arg>
-inline decltype(auto)
-mem_fun(T_return (T_obj::*func)(T_arg...) volatile)
+inline decltype(auto) mem_fun(T_return (T_obj::*func)(T_arg...) volatile)
 {
   return mem_functor<T_return (T_obj::*)(T_arg...) volatile, T_arg...>(func);
 }
diff --git a/sigc++/functors/ptr_fun.h b/sigc++/functors/ptr_fun.h
@@ -106,8 +106,7 @@ class pointer_functor<T_return(T_args...)>
  * @ingroup ptr_fun
  */
 template<typename T_return, typename... T_args>
-inline decltype(auto)
-ptr_fun(T_return (*func)(T_args...))
+inline decltype(auto) ptr_fun(T_return (*func)(T_args...))
 {
   return pointer_functor<T_return(T_args...)>(func);
 }

Original file line number	Diff line number	Diff line change
`@@ -187,8 +187,7 @@ struct visitor<bound_mem_functor<T_func, T_arg...>>`
`187`	`187`	`* @ingroup mem_fun`
`188`	`188`	`*/`
`189`	`189`	`template<typename T_return, typename T_obj, typename... T_arg>`
`190`		`-inline decltype(auto)`
`191`		`-mem_fun(T_return (T_obj::*func)(T_arg...))`
	`190`	`+inline decltype(auto) mem_fun(T_return (T_obj::*func)(T_arg...))`
`192`	`191`	`{`
`193`	`192`	`return mem_functor<T_return (T_obj::*)(T_arg...), T_arg...>(func);`
`194`	`193`	`}`
`@@ -213,8 +212,7 @@ mem_fun(T_return (T_obj::*func)(T_arg...) const)`
`213`	`212`	`* @ingroup mem_fun`
`214`	`213`	`*/`
`215`	`214`	`template<typename T_return, typename T_obj, typename... T_arg>`
`216`		`-inline decltype(auto)`
`217`		`-mem_fun(T_return (T_obj::*func)(T_arg...) volatile)`
	`215`	`+inline decltype(auto) mem_fun(T_return (T_obj::*func)(T_arg...) volatile)`
`218`	`216`	`{`
`219`	`217`	`return mem_functor<T_return (T_obj::*)(T_arg...) volatile, T_arg...>(func);`
`220`	`218`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,7 @@ class pointer_functor<T_return(T_args...)>`
`106`	`106`	`* @ingroup ptr_fun`
`107`	`107`	`*/`
`108`	`108`	`template<typename T_return, typename... T_args>`
`109`		`-inline decltype(auto)`
`110`		`-ptr_fun(T_return (*func)(T_args...))`
	`109`	`+inline decltype(auto) ptr_fun(T_return (*func)(T_args...))`
`111`	`110`	`{`
`112`	`111`	`return pointer_functor<T_return(T_args...)>(func);`
`113`	`112`	`}`