summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2016-02-19 11:33:56 +0100
committerMurray Cumming <murrayc@murrayc.com>2016-02-19 11:33:59 +0100
commit78f0a228ecdbfe4d73f6fea2be686e65f77b6eca (patch)
tree48a83fe2a6a57d4c0ce880250a88aefa40096206
parent3a55cd4e13ec21d5c39411e8d26cea945f8db47d (diff)
downloadsigc++-78f0a228ecdbfe4d73f6fea2be686e65f77b6eca.tar.gz
Avoid std::make_tuple().
To preserve std::ref()ed elements.
-rw-r--r--sigc++/adaptors/bind.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sigc++/adaptors/bind.h b/sigc++/adaptors/bind.h
index 3543703..d3ccfa6 100644
--- a/sigc++/adaptors/bind.h
+++ b/sigc++/adaptors/bind.h
@@ -131,7 +131,7 @@ struct bind_functor : public adapts<T_functor>
//we would want to call operator() with (_A_arg0, bound, _A_arg1, _A_arg2).
using tuple_type_args = std::tuple<type_trait_pass_t<T_arg>...>;
- auto t_args = std::make_tuple(_A_arg...);
+ auto t_args = std::tuple<T_arg...>(_A_arg...);
constexpr auto t_args_size = std::tuple_size<tuple_type_args>::value;
auto t_start = tuple_start<I_location>(t_args);
@@ -201,7 +201,7 @@ struct bind_functor<-1, T_functor, T_type...> : public adapts<T_functor>
//For instance, if _A_arg has 4 arguments,
//we would want to call operator() with (_A_arg0, _A_arg1, _A_arg2, bound).
- auto t_args = std::make_tuple(_A_arg...);
+ auto t_args = std::tuple<T_arg...>(_A_arg...);
auto t_bound = tuple_transform_each<internal::TransformEachInvoker>(bound_);
auto t_with_bound = std::tuple_cat(t_args, t_bound);