diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2016-03-01 21:55:38 +0100 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2016-03-01 21:58:33 +0100 |
| commit | 289fd2cdd52bbdc9e0100cc201da1b3b0ea79c8c (patch) | |
| tree | 31aee3ca1415d78465e23c3ee1258679c1d5df93 | |
| parent | 4580a18f4c00ec48078b5c047909cb51545db699 (diff) | |
| download | sigc++-variadic.tar.gz | |
bind: Correct wrong use of type_trait_take_t.variadic
Instead of type_trait_pass_t.
This was caused by an incorrect substitution in this commit:
https://git.gnome.org/browse/libsigc++2/commit/?h=variadic&id=e0d2c10094c043294a9d07f8a6ab4e0e2611534f
| -rw-r--r-- | sigc++/adaptors/macros/bind.h.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sigc++/adaptors/macros/bind.h.m4 b/sigc++/adaptors/macros/bind.h.m4 index e091fe5..dad5186 100644 --- a/sigc++/adaptors/macros/bind.h.m4 +++ b/sigc++/adaptors/macros/bind.h.m4 @@ -33,7 +33,7 @@ FOR(1, eval($2-1),[ template <LOOP([class T_arg%1], eval($2-1))> decltype(auto) operator()(LOOP(T_arg%1 _A_arg%1,eval($2-1))) - { return this->functor_.SIGC_WORKAROUND_OPERATOR_PARENTHESES<LIST(LOOP([type_trait_pass_t<T_arg%1>], eval($1-1)), type_trait_take_t<typename unwrap_reference<T_bound>::type>, FOR($1,eval($2-1),[type_trait_take_t<T_arg%1>,]))> + { return this->functor_.SIGC_WORKAROUND_OPERATOR_PARENTHESES<LIST(LOOP([type_trait_pass_t<T_arg%1>], eval($1-1)), type_trait_pass_t<typename unwrap_reference<T_bound>::type>, FOR($1,eval($2-1),[type_trait_pass_t<T_arg%1>,]))> (LIST(LOOP(_A_arg%1,eval($1-1)), bound_.invoke(), FOR($1,eval($2-1),[_A_arg%1,]))); } @@ -49,7 +49,7 @@ FOR(1, eval($2-1),[ template <LOOP([class T_arg%1], eval($2-1))> decltype(auto) operator()(LOOP(T_arg%1 _A_arg%1, eval($2-1))) - { return this->functor_.SIGC_WORKAROUND_OPERATOR_PARENTHESES<LIST(LOOP([type_trait_pass_t<T_arg%1>], eval($2-1)), LOOP(type_trait_take_t<typename unwrap_reference<T_type%1>::type>, $1))> + { return this->functor_.SIGC_WORKAROUND_OPERATOR_PARENTHESES<LIST(LOOP([type_trait_pass_t<T_arg%1>], eval($2-1)), LOOP(type_trait_pass_t<typename unwrap_reference<T_type%1>::type>, $1))> (LIST(LOOP(_A_arg%1,eval($2-1)), LOOP(bound%1_.invoke(), $1))); } |