mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-03 07:35:48 +08:00
Removed own implementation of std::index_sequence that was needed for GCC 4.9.
This commit is contained in:
@@ -41,13 +41,13 @@ namespace BlackMisc
|
||||
|
||||
// Like invoke() but ignores the first argument if callable is not a member function. For uniform calling of callables with slot semantics.
|
||||
template <typename F, typename T, typename U, size_t... Is>
|
||||
decltype(auto) invokeSlotImpl(F ptr, T *object, U tuple, index_sequence<Is...>, std::true_type)
|
||||
decltype(auto) invokeSlotImpl(F ptr, T *object, U tuple, std::index_sequence<Is...>, std::true_type)
|
||||
{
|
||||
Q_UNUSED(tuple); // in case the pack expansion is empty
|
||||
return (object->*ptr)(std::forward<std::tuple_element_t<Is, U>>(std::get<Is>(tuple))...);
|
||||
}
|
||||
template <typename F, typename T, typename U, size_t... Is>
|
||||
decltype(auto) invokeSlotImpl(F &&func, T *, U tuple, index_sequence<Is...>, std::false_type)
|
||||
decltype(auto) invokeSlotImpl(F &&func, T *, U tuple, std::index_sequence<Is...>, std::false_type)
|
||||
{
|
||||
Q_UNUSED(tuple); // in case the pack expansion is empty
|
||||
return std::forward<F>(func)(std::forward<std::tuple_element_t<Is, U>>(std::get<Is>(tuple))...);
|
||||
@@ -55,7 +55,7 @@ namespace BlackMisc
|
||||
template <typename F, typename T, typename... Ts>
|
||||
decltype(auto) invokeSlot(F &&func, T *object, Ts &&... args)
|
||||
{
|
||||
using seq = MaskSequence<make_index_sequence<sizeof...(Ts)>, ! TIsQPrivateSignal<std::decay_t<Ts>>::value...>;
|
||||
using seq = MaskSequence<std::make_index_sequence<sizeof...(Ts)>, ! TIsQPrivateSignal<std::decay_t<Ts>>::value...>;
|
||||
return invokeSlotImpl(std::forward<F>(func), object, std::forward_as_tuple(std::forward<Ts>(args)...), seq(), std::is_member_pointer<std::decay_t<F>>());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user