Format source code to suit clang-format

kjellahl · kjellahl · commit 783ad8239c03 · 2021-12-23T12:51:38.000+01:00
* sigc++/functors/mem_fun.h:
* sigc++/functors/ptr_fun.h:
* tests/test_rvalue_ref.cc: Reformated with clang-format 13,
but CI uses clang-format 10.

Also add #include &lt;utility&gt; where std::forward was added. Doesn't seem
to be necessary with g++ or clang++. Mostly a precaution.
diff --git a/sigc++/functors/mem_fun.h b/sigc++/functors/mem_fun.h
@@ -22,6 +22,7 @@
 #include <sigc++/limit_reference.h>
 #include <sigc++/member_method_trait.h>
 #include <functional>
+#include <utility>
 
 // implementation notes:
 //  - we do not use bind here, because it would introduce
@@ -150,8 +151,7 @@ class bound_mem_functor : mem_functor<T_func, T_arg...>
   decltype(auto) operator()(type_trait_take_t<T_arg>... a) const
   {
     return std::invoke(
-      this->func_ptr_, obj_.invoke(),
-      std::forward<type_trait_take_t<T_arg>>(a)...);
+      this->func_ptr_, obj_.invoke(), std::forward<type_trait_take_t<T_arg>>(a)...);
   }
 
   // protected:
@@ -187,7 +187,8 @@ 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);
 }
@@ -212,7 +213,8 @@ 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
@@ -20,6 +20,7 @@
 #define SIGC_FUNCTORS_PTR_FUN_H
 #include <sigc++/type_traits.h>
 #include <functional>
+#include <utility>
 
 namespace sigc
 {
@@ -92,7 +93,8 @@ class pointer_functor<T_return(T_args...)>
    * @param a Arguments to be passed on to the function.
    * @return The return value of the function invocation.
    */
-  T_return operator()(type_trait_take_t<T_args>... a) const {
+  T_return operator()(type_trait_take_t<T_args>... a) const
+  {
     return std::invoke(func_ptr_, std::forward<type_trait_take_t<T_args>>(a)...);
   }
 };
@@ -104,7 +106,8 @@ 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);
 }
diff --git a/tests/test_rvalue_ref.cc b/tests/test_rvalue_ref.cc
@@ -18,10 +18,12 @@ struct foo
 
 struct A
 {
-  void foo(MoveableStruct &&) { result_stream << "A::foo(MoveableStruct&&)"; }
+  void foo(MoveableStruct&&) { result_stream << "A::foo(MoveableStruct&&)"; }
 };
 
-void boo(MoveableStruct &&) {
+void
+boo(MoveableStruct&&)
+{
   result_stream << "boo(MoveableStruct&&)";
 }
 
@@ -52,7 +54,7 @@ test_slot()
 void
 test_mem_fun()
 {
-  sigc::slot<void(A &, MoveableStruct &&)> slot;
+  sigc::slot<void(A&, MoveableStruct &&)> slot;
   A a;
   slot = sigc::mem_fun(&A::foo);
   MoveableStruct x;

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`#include <sigc++/limit_reference.h>`
`23`	`23`	`#include <sigc++/member_method_trait.h>`
`24`	`24`	`#include <functional>`
	`25`	`+#include <utility>`
`25`	`26`
`26`	`27`	`// implementation notes:`
`27`	`28`	`// - we do not use bind here, because it would introduce`
`@@ -150,8 +151,7 @@ class bound_mem_functor : mem_functor<T_func, T_arg...>`
`150`	`151`	`decltype(auto) operator()(type_trait_take_t<T_arg>... a) const`
`151`	`152`	`{`
`152`	`153`	`return std::invoke(`
`153`		`- this->func_ptr_, obj_.invoke(),`
`154`		`- std::forward<type_trait_take_t<T_arg>>(a)...);`
	`154`	`+ this->func_ptr_, obj_.invoke(), std::forward<type_trait_take_t<T_arg>>(a)...);`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`// protected:`
`@@ -187,7 +187,8 @@ 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) mem_fun(T_return (T_obj::*func)(T_arg...))`
	`190`	`+inline decltype(auto)`
	`191`	`+mem_fun(T_return (T_obj::*func)(T_arg...))`
`191`	`192`	`{`
`192`	`193`	`return mem_functor<T_return (T_obj::*)(T_arg...), T_arg...>(func);`
`193`	`194`	`}`
`@@ -212,7 +213,8 @@ mem_fun(T_return (T_obj::*func)(T_arg...) const)`
`212`	`213`	`* @ingroup mem_fun`
`213`	`214`	`*/`
`214`	`215`	`template<typename T_return, typename T_obj, typename... T_arg>`
`215`		`-inline decltype(auto) mem_fun(T_return (T_obj::*func)(T_arg...) volatile)`
	`216`	`+inline decltype(auto)`
	`217`	`+mem_fun(T_return (T_obj::*func)(T_arg...) volatile)`
`216`	`218`	`{`
`217`	`219`	`return mem_functor<T_return (T_obj::*)(T_arg...) volatile, T_arg...>(func);`
`218`	`220`	`}`