wip: C++20: Make sigc::ptr_fun() constexpr

murraycu · murraycu · commit 9bef38d9a3ee · 2019-10-27T15:28:00.000+01:00
This needs C++20 because it needs constexpr std::invoke().

However, I don't currently have a compiler/library that has constexpr
std::invoke().
diff --git a/sigc++/functors/ptr_fun.h b/sigc++/functors/ptr_fun.h
@@ -82,18 +82,18 @@ class pointer_functor<T_return(T_args...)>
 public:
 
   /// Constructs an invalid functor.
-  pointer_functor() = default;
+  constexpr pointer_functor() = default;
 
   /** Constructs a pointer_functor2 object that wraps an existing function.
    * @param func Pointer to function that will be invoked from operator()().
    */
-  explicit pointer_functor(function_type func) : func_ptr_(func) {}
+  constexpr explicit pointer_functor(function_type func) : func_ptr_(func) {}
 
   /** Execute the wrapped function.
    * @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 {
+  constexpr T_return operator()(type_trait_take_t<T_args>... a) const {
     return std::invoke(func_ptr_, a...);
   }
 };
@@ -105,7 +105,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 constexpr decltype(auto) ptr_fun(T_return (*func)(T_args...))
 {
   return pointer_functor<T_return(T_args...)>(func);
 }
diff --git a/sigc++/functors/slot.h b/sigc++/functors/slot.h
@@ -48,7 +48,7 @@ namespace internal
  * (argument-dependent lookup).
  */
 template <typename T_out, typename T_in>
-inline T_out function_pointer_cast(T_in in)
+inline constexpr T_out function_pointer_cast(T_in in)
 {
   // The double reinterpret_cast suppresses a warning from gcc8 with the
   // -Wcast-function-type option.
@@ -78,13 +78,13 @@ struct typed_slot_rep : public slot_rep
    * The notification callback is registered using visit_each().
    * @param functor The functor contained by the new slot_rep object.
    */
-  inline explicit typed_slot_rep(const T_functor& functor)
+  inline constexpr explicit typed_slot_rep(const T_functor& functor)
   : slot_rep(nullptr), functor_(std::make_unique<adaptor_type>(functor))
   {
     sigc::visit_each_trackable(slot_do_bind(this), *functor_);
   }
 
-  inline typed_slot_rep(const typed_slot_rep& src)
+  inline constexpr typed_slot_rep(const typed_slot_rep& src)
   : slot_rep(src.call_), functor_(std::make_unique<adaptor_type>(*src.functor_))
   {
     sigc::visit_each_trackable(slot_do_bind(this), *functor_);
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -26,6 +26,7 @@ set (TEST_SOURCE_FILES
   test_bind_return.cc
   test_compose.cc
   test_connection.cc
+  test_constexpr.cc
   test_copy_invalid_slot.cc
   test_cpp11_lambda.cc
   test_custom.cc
diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -33,6 +33,7 @@ check_PROGRAMS = \
   test_bind_return \
   test_compose \
   test_connection \
+  test_constexpr \
   test_copy_invalid_slot \
   test_cpp11_lambda \
   test_custom \
@@ -77,6 +78,7 @@ test_bind_refptr_SOURCES     = test_bind_refptr.cc $(sigc_test_util)
 test_bind_return_SOURCES     = test_bind_return.cc $(sigc_test_util)
 test_compose_SOURCES         = test_compose.cc $(sigc_test_util)
 test_connection_SOURCES      = test_connection.cc $(sigc_test_util)
+test_constexpr_SOURCES       = test_constexpr.cc $(sigc_test_util)
 test_copy_invalid_slot_SOURCES = test_copy_invalid_slot.cc $(sigc_test_util)
 test_cpp11_lambda_SOURCES    = test_cpp11_lambda.cc $(sigc_test_util)
 test_custom_SOURCES          = test_custom.cc $(sigc_test_util)
diff --git a/tests/test_constexpr.cc b/tests/test_constexpr.cc
@@ -0,0 +1,27 @@
+/* Copyright 2002 - 2016, The libsigc++ Development Team
+ *  Assigned to public domain.  Use as you wish without restriction.
+ */
+
+#include "testutilities.h"
+#include <sigc++/sigc++.h>
+
+namespace {
+
+constexpr
+int foo(int a, int b) {
+    return a + b;
+}
+
+} // end anonymous namespace
+
+int
+main()
+{
+  constexpr auto slot = sigc::ptr_fun(&foo);
+  constexpr auto result = slot(1, 2);
+  if (result != 3) {
+      return EXIT_FAILURE;
+  }
+
+  EXIT_SUCCESS;
+}

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ namespace internal`
`48`	`48`	`* (argument-dependent lookup).`
`49`	`49`	`*/`
`50`	`50`	`template <typename T_out, typename T_in>`
`51`		`-inline T_out function_pointer_cast(T_in in)`
	`51`	`+inline constexpr T_out function_pointer_cast(T_in in)`
`52`	`52`	`{`
`53`	`53`	`// The double reinterpret_cast suppresses a warning from gcc8 with the`
`54`	`54`	`// -Wcast-function-type option.`
`@@ -78,13 +78,13 @@ struct typed_slot_rep : public slot_rep`
`78`	`78`	`* The notification callback is registered using visit_each().`
`79`	`79`	`* @param functor The functor contained by the new slot_rep object.`
`80`	`80`	`*/`
`81`		`- inline explicit typed_slot_rep(const T_functor& functor)`
	`81`	`+ inline constexpr explicit typed_slot_rep(const T_functor& functor)`
`82`	`82`	`: slot_rep(nullptr), functor_(std::make_unique<adaptor_type>(functor))`
`83`	`83`	`{`
`84`	`84`	`sigc::visit_each_trackable(slot_do_bind(this), *functor_);`
`85`	`85`	`}`
`86`	`86`
`87`		`- inline typed_slot_rep(const typed_slot_rep& src)`
	`87`	`+ inline constexpr typed_slot_rep(const typed_slot_rep& src)`
`88`	`88`	`: slot_rep(src.call_), functor_(std::make_unique<adaptor_type>(*src.functor_))`
`89`	`89`	`{`
`90`	`90`	`sigc::visit_each_trackable(slot_do_bind(this), *functor_);`