[libsigcplusplus/variadic_mem_fun3: 10/148] adaptor_functor: Make deduce_result_type variadic.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsigcplusplus/variadic_mem_fun3: 10/148] adaptor_functor: Make deduce_result_type variadic.
- Date: Mon, 7 Mar 2016 09:58:38 +0000 (UTC)
commit b0df681c6a1ebe8727db57fd2db772d3a296aa7e
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Jan 7 17:52:06 2016 +0100
adaptor_functor: Make deduce_result_type variadic.
Instead of having all 7 arguments, defaulting to void.
sigc++/adaptors/macros/adaptor_trait.h.m4 | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/sigc++/adaptors/macros/adaptor_trait.h.m4 b/sigc++/adaptors/macros/adaptor_trait.h.m4
index a7a0613..74ebb61 100644
--- a/sigc++/adaptors/macros/adaptor_trait.h.m4
+++ b/sigc++/adaptors/macros/adaptor_trait.h.m4
@@ -132,9 +132,9 @@ template <class T_functor>
struct adaptor_functor : public adaptor_base
{
#ifndef DOXYGEN_SHOULD_SKIP_THIS
- template <LOOP(class T_arg%1=void, CALL_SIZE)>
+ template <class... T_arg>
struct deduce_result_type
- { typedef sigc::deduce_result_t<LIST(T_functor, LOOP(T_arg%1,CALL_SIZE))> type; };
+ { typedef sigc::deduce_result_t<T_functor, T_arg...> type; };
#endif
typedef typename functor_trait<T_functor>::result_type result_type;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]