C++17: More use of std::invoke().

murraycu · murraycu · commit 107d09760f15 · 2018-04-08T20:45:51.000+02:00
The use of template operator() here was maybe to deal with
awkward compilers, but now we can just expect them to support
std::invoke() from C++17.
diff --git a/sigc++/adaptors/bind_return.h b/sigc++/adaptors/bind_return.h
@@ -49,8 +49,7 @@ struct bind_return_functor : public adapts<T_functor>
   template <typename... T_arg>
   inline typename unwrap_reference<T_return>::type operator()(T_arg... a)
   {
-    //TODO: Use std::invoke() here?
-    this->functor_.template operator()<type_trait_pass_t<T_arg>...>(a...);
+    std::invoke(this->functor_, a...);
     return ret_value_.invoke();
   }
 
diff --git a/sigc++/adaptors/exception_catch.h b/sigc++/adaptors/exception_catch.h
@@ -93,8 +93,7 @@ struct exception_catch_functor : public adapts<T_functor>
   {
     try
     {
-      //TODO: Use std::invoke here?
-      return this->functor_.template operator()<type_trait_pass_t<T_arg>...>(a...);
+      return std::invoke(this->functor_, a...);
     }
     catch (...)
     {
diff --git a/sigc++/adaptors/retype.h b/sigc++/adaptors/retype.h
@@ -82,9 +82,7 @@ struct retype_functor : public adapts<T_functor>
   template <typename... T_arg>
   decltype(auto) operator()(T_arg... a)
   {
-    //TODO: Use std::invoke() here?
-    return this->functor_.template operator()<type_trait_take_t<T_type>...>(
-      static_cast<T_type>(a)...);
+    return std::invoke(this->functor_, static_cast<T_type>(a)...);
   }
 
   /** Constructs a retype_functor object that performs C-style casts on the parameters passed on to
diff --git a/sigc++/adaptors/retype_return.h b/sigc++/adaptors/retype_return.h
@@ -41,8 +41,7 @@ struct retype_return_functor : public adapts<T_functor>
   template <typename... T_arg>
   inline T_return operator()(T_arg&&... a)
   {
-    //TODO: Use std::invoke() here?
-    return T_return(this->functor_.template operator() < T_arg... > (std::forward<T_arg>(a)...));
+    return T_return(std::invoke(this->functor_, std::forward<T_arg>(a)...));
   }
 
   retype_return_functor() = default;
@@ -82,8 +81,7 @@ struct retype_return_functor<void, T_functor> : public adapts<T_functor>
   template <typename... T_arg>
   inline void operator()(T_arg... a)
   {
-    //TODO: Use std::invoke() here?
-    this->functor_.template operator()<T_arg...>(a...);
+    std::invoke(this->functor_, a...);
   }
 
   retype_return_functor() = default;
diff --git a/sigc++/adaptors/track_obj.h b/sigc++/adaptors/track_obj.h
@@ -94,9 +94,7 @@ class track_obj_functor : public adapts<T_functor>
   template <typename... T_arg>
   decltype(auto) operator()(T_arg&&... arg)
   {
-    //TODO: Use std::invoke() here?
-    return this->functor_.template operator()<type_trait_pass_t<T_arg>...>(
-      std::forward<T_arg>(arg)...);
+    return std::invoke(this->functor_, std::forward<T_arg>(arg)...);
   }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,7 @@ struct bind_return_functor : public adapts<T_functor>`
`49`	`49`	`template <typename... T_arg>`
`50`	`50`	`inline typename unwrap_reference<T_return>::type operator()(T_arg... a)`
`51`	`51`	`{`
`52`		`- //TODO: Use std::invoke() here?`
`53`		`- this->functor_.template operator()<type_trait_pass_t<T_arg>...>(a...);`
	`52`	`+ std::invoke(this->functor_, a...);`
`54`	`53`	`return ret_value_.invoke();`
`55`	`54`	`}`
`56`	`55`
Original file line number	Diff line number	Diff line change
`@@ -93,8 +93,7 @@ struct exception_catch_functor : public adapts<T_functor>`
`93`	`93`	`{`
`94`	`94`	`try`
`95`	`95`	`{`
`96`		`- //TODO: Use std::invoke here?`
`97`		`- return this->functor_.template operator()<type_trait_pass_t<T_arg>...>(a...);`
	`96`	`+ return std::invoke(this->functor_, a...);`
`98`	`97`	`}`
`99`	`98`	`catch (...)`
`100`	`99`	`{`
Original file line number	Diff line number	Diff line change
`@@ -82,9 +82,7 @@ struct retype_functor : public adapts<T_functor>`
`82`	`82`	`template <typename... T_arg>`
`83`	`83`	`decltype(auto) operator()(T_arg... a)`
`84`	`84`	`{`
`85`		`- //TODO: Use std::invoke() here?`
`86`		`- return this->functor_.template operator()<type_trait_take_t<T_type>...>(`
`87`		`- static_cast<T_type>(a)...);`
	`85`	`+ return std::invoke(this->functor_, static_cast<T_type>(a)...);`
`88`	`86`	`}`
`89`	`87`
`90`	`88`	`/** Constructs a retype_functor object that performs C-style casts on the parameters passed on to`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,7 @@ struct retype_return_functor : public adapts<T_functor>`
`41`	`41`	`template <typename... T_arg>`
`42`	`42`	`inline T_return operator()(T_arg&&... a)`
`43`	`43`	`{`
`44`		`- //TODO: Use std::invoke() here?`
`45`		`- return T_return(this->functor_.template operator() < T_arg... > (std::forward<T_arg>(a)...));`
	`44`	`+ return T_return(std::invoke(this->functor_, std::forward<T_arg>(a)...));`
`46`	`45`	`}`
`47`	`46`
`48`	`47`	`retype_return_functor() = default;`
`@@ -82,8 +81,7 @@ struct retype_return_functor<void, T_functor> : public adapts<T_functor>`
`82`	`81`	`template <typename... T_arg>`
`83`	`82`	`inline void operator()(T_arg... a)`
`84`	`83`	`{`
`85`		`- //TODO: Use std::invoke() here?`
`86`		`- this->functor_.template operator()<T_arg...>(a...);`
	`84`	`+ std::invoke(this->functor_, a...);`
`87`	`85`	`}`
`88`	`86`
`89`	`87`	`retype_return_functor() = default;`
Original file line number	Diff line number	Diff line change
`@@ -94,9 +94,7 @@ class track_obj_functor : public adapts<T_functor>`
`94`	`94`	`template <typename... T_arg>`
`95`	`95`	`decltype(auto) operator()(T_arg&&... arg)`
`96`	`96`	`{`
`97`		`- //TODO: Use std::invoke() here?`
`98`		`- return this->functor_.template operator()<type_trait_pass_t<T_arg>...>(`
`99`		`- std::forward<T_arg>(arg)...);`
	`97`	`+ return std::invoke(this->functor_, std::forward<T_arg>(arg)...);`
`100`	`98`	`}`
`101`	`99`
`102`	`100`	`#ifndef DOXYGEN_SHOULD_SKIP_THIS`