test_rvalue_ref: Small fixes

kjellahl · kjellahl · commit 317ab48ceb0a · 2021-06-02T22:36:35.000+02:00
* tests/.gitignore:
* tests/CMakeLists.txt:
* tests/Makefile.am: Add test_rvalue_ref.
* tests/test_rvalue_ref.cc: Avoid [-Werror=unused-parameter]
when building with warnings=fatal.

Some files have been reformated with clang-format in order to
make the CI tests happy. Reformated with clang-format 12, but CI
uses clang-format 10.
diff --git a/sigc++/functors/slot.h b/sigc++/functors/slot.h
@@ -151,8 +151,9 @@ struct slot_call
   static T_return call_it(slot_rep* rep, type_trait_take_t<T_arg>... a_)
   {
     auto typed_rep = static_cast<typed_slot_rep<T_functor>*>(rep);
-    return (*typed_rep->functor_).template operator()<type_trait_take_t<T_arg>...>(
-      std::forward<type_trait_take_t<T_arg>>(a_)...);
+    return (*typed_rep->functor_)
+      .template operator()<type_trait_take_t<T_arg>...>(
+        std::forward<type_trait_take_t<T_arg>>(a_)...);
   }
 
   /** Forms a function pointer from call_it().
diff --git a/sigc++/signal.h b/sigc++/signal.h
@@ -364,8 +364,7 @@ struct signal_emit<void, void, T_arg...>
         continue;
 
       (sigc::internal::function_pointer_cast<call_type>(slot.rep_->call_))(
-        slot.rep_,
-        std::forward<type_trait_take_t<T_arg>>(a)...);
+        slot.rep_, std::forward<type_trait_take_t<T_arg>>(a)...);
     }
   }
 };
@@ -456,7 +455,8 @@ class signal_with_accumulator : public signal_base
   }
 
   /** Triggers the emission of the signal (see emit()). */
-  decltype(auto) operator()(type_trait_take_t<T_arg>... a) const {
+  decltype(auto) operator()(type_trait_take_t<T_arg>... a) const
+  {
     return emit(std::forward<type_trait_take_t<T_arg>>(a)...);
   }
 
diff --git a/tests/.gitignore b/tests/.gitignore
@@ -24,6 +24,7 @@
 /test_ptr_fun
 /test_retype
 /test_retype_return
+/test_rvalue_ref
 /test_signal
 /test_signal_move
 /test_size
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -39,6 +39,7 @@ set (TEST_SOURCE_FILES
   test_ptr_fun.cc
   test_retype.cc
   test_retype_return.cc
+  test_rvalue_ref.cc
   test_signal.cc
   test_signal_move.cc
   test_size.cc
diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -46,6 +46,7 @@ check_PROGRAMS = \
   test_ptr_fun \
   test_retype \
   test_retype_return \
+  test_rvalue_ref \
   test_signal \
   test_signal_move \
   test_size \
@@ -90,6 +91,7 @@ test_mem_fun_SOURCES         = test_mem_fun.cc $(sigc_test_util)
 test_ptr_fun_SOURCES         = test_ptr_fun.cc $(sigc_test_util)
 test_retype_SOURCES          = test_retype.cc $(sigc_test_util)
 test_retype_return_SOURCES   = test_retype_return.cc $(sigc_test_util)
+test_rvalue_ref_SOURCES      = test_rvalue_ref.cc $(sigc_test_util)
 test_signal_SOURCES          = test_signal.cc $(sigc_test_util)
 test_signal_move_SOURCES     = test_signal_move.cc $(sigc_test_util)
 test_size_SOURCES            = test_size.cc $(sigc_test_util)
diff --git a/tests/test_rvalue_ref.cc b/tests/test_rvalue_ref.cc
@@ -2,7 +2,9 @@
 #include <iostream>
 #include <sigc++/signal.h>
 
-struct MoveableStruct {};
+struct MoveableStruct
+{
+};
 
 namespace
 {
@@ -11,18 +13,15 @@ std::ostringstream result_stream;
 
 struct foo
 {
-  void operator()(MoveableStruct &&x)
-  {
-    result_stream << "foo(MoveableStruct&&)";
-  }
+  void operator()(MoveableStruct&& /* x */) { result_stream << "foo(MoveableStruct&&)"; }
 };
 
 } // end anonymous namespace
 
 void
 test_signal()
 {
-  sigc::signal<void (MoveableStruct &&)> signal;
+  sigc::signal<void(MoveableStruct &&)> signal;
   foo f;
   signal.connect(f);
   MoveableStruct x;
@@ -33,7 +32,7 @@ test_signal()
 void
 test_slot()
 {
-  sigc::slot<void (MoveableStruct &&)> slot;
+  sigc::slot<void(MoveableStruct &&)> slot;
   foo f;
   slot = f;
   MoveableStruct x;

Original file line number	Diff line number	Diff line change
`@@ -151,8 +151,9 @@ struct slot_call`
`151`	`151`	`static T_return call_it(slot_rep* rep, type_trait_take_t<T_arg>... a_)`
`152`	`152`	`{`
`153`	`153`	`auto typed_rep = static_cast<typed_slot_rep<T_functor>*>(rep);`
`154`		`- return (*typed_rep->functor_).template operator()<type_trait_take_t<T_arg>...>(`
`155`		`- std::forward<type_trait_take_t<T_arg>>(a_)...);`
	`154`	`+ return (*typed_rep->functor_)`
	`155`	`+ .template operator()<type_trait_take_t<T_arg>...>(`
	`156`	`+ std::forward<type_trait_take_t<T_arg>>(a_)...);`
`156`	`157`	`}`
`157`	`158`
`158`	`159`	`/** Forms a function pointer from call_it().`
Original file line number	Diff line number	Diff line change
`@@ -364,8 +364,7 @@ struct signal_emit<void, void, T_arg...>`
`364`	`364`	`continue;`
`365`	`365`
`366`	`366`	`(sigc::internal::function_pointer_cast<call_type>(slot.rep_->call_))(`
`367`		`- slot.rep_,`
`368`		`- std::forward<type_trait_take_t<T_arg>>(a)...);`
	`367`	`+ slot.rep_, std::forward<type_trait_take_t<T_arg>>(a)...);`
`369`	`368`	`}`
`370`	`369`	`}`
`371`	`370`	`};`
`@@ -456,7 +455,8 @@ class signal_with_accumulator : public signal_base`
`456`	`455`	`}`
`457`	`456`
`458`	`457`	`/** Triggers the emission of the signal (see emit()). */`
`459`		`- decltype(auto) operator()(type_trait_take_t<T_arg>... a) const {`
	`458`	`+ decltype(auto) operator()(type_trait_take_t<T_arg>... a) const`
	`459`	`+ {`
`460`	`460`	`return emit(std::forward<type_trait_take_t<T_arg>>(a)...);`
`461`	`461`	`}`
`462`	`462`