Ticket #8102: std-tuple-get.patch

boost/signals2/detail/variadic_slot_invoker.hpp

@@ -15 +15 @@
 #ifndef BOOST_SIGNALS2_DETAIL_VARIADIC_SLOT_INVOKER_HPP
 #define BOOST_SIGNALS2_DETAIL_VARIADIC_SLOT_INVOKER_HPP
 
+#include <boost/mpl/size_t.hpp>
 #include <boost/signals2/detail/variadic_arg_type.hpp>
 
 // if compiler has std::tuple use it instead of boost::tuple
@@ -22 +23 @@
 #ifdef BOOST_NO_CXX11_HDR_TUPLE
 #include <boost/tuple/tuple.hpp>
 #define BOOST_SIGNALS2_TUPLE boost::tuple
+#define BOOST_SIGNALS2_GET boost::get
 #else
 #include <tuple>
 #define BOOST_SIGNALS2_TUPLE std::tuple
+#define BOOST_SIGNALS2_GET std::get
 #endif
 
 namespace boost
@@ -70 +73 @@
       public:
         typedef R result_type;
 
-        template<typename Func, typename ... Args>
-          R operator()(Func &func, BOOST_SIGNALS2_TUPLE<Args...> args) const
+        template<typename Func, typename ... Args, std::size_t N>
+        R operator()(Func &func, BOOST_SIGNALS2_TUPLE<Args...> args, mpl::size_t<N>) const
         {
-          typedef typename make_unsigned_meta_array<sizeof...(Args)>::type indices_type;
+          typedef typename make_unsigned_meta_array<N>::type indices_type;
           typename Func::result_type *resolver = 0;
           return m_invoke(resolver, func, indices_type(), args);
         }
@@ -81 +84 @@
         template<typename T, typename Func, unsigned ... indices, typename ... Args>
           R m_invoke(T *, Func &func, unsigned_meta_array<indices...>, BOOST_SIGNALS2_TUPLE<Args...> args) const
         {
-          return func(std::get<indices>(args)...);
+          return func(BOOST_SIGNALS2_GET<indices>(args)...);
         }
         template<typename Func, unsigned ... indices, typename ... Args>
           R m_invoke(void *, Func &func, unsigned_meta_array<indices...>, BOOST_SIGNALS2_TUPLE<Args...> args) const
         {
-          func(std::get<indices>(args)...);
+          func(BOOST_SIGNALS2_GET<indices>(args)...);
           return R();
         }
       };
@@ -111 +114 @@
         result_type m_invoke(const ConnectionBodyType &connectionBody,
           const void_type *) const
         {
-          return call_with_tuple_args<result_type>()(connectionBody->slot.slot_function(), _args);
+          return call_with_tuple_args<result_type>()(connectionBody->slot.slot_function(), _args, mpl::size_t<sizeof...(Args)>());
           return void_type();
         }
         template<typename ConnectionBodyType>
           result_type m_invoke(const ConnectionBodyType &connectionBody, ...) const
         {
-          return call_with_tuple_args<result_type>()(connectionBody->slot.slot_function(), _args);
+          return call_with_tuple_args<result_type>()(connectionBody->slot.slot_function(), _args, mpl::size_t<sizeof...(Args)>());
         }
         BOOST_SIGNALS2_TUPLE<Args& ...> _args;
       };