flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 01:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use std::invoke (C++17 feature)

Browse Source
This commit is contained in:
Mat Sutcliffe
2021-04-17 22:21:37 +01:00
parent 33209fa1eb
commit 76c59e88ea
2 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blackmisc/invoke.h
View File

@@ -26,23 +26,6 @@ namespace BlackMisc
namespace Private
{
// Our own version of C++17 std::invoke().
template <typename F, typename T, typename = std::enable_if_t<std::is_member_object_pointer_v<F>>>
decltype(auto) invoke(F ptr, T && object)
{
return std::forward<T>(object).*ptr;
}
template <typename F, typename T, typename... Ts, typename = std::enable_if_t<std::is_member_function_pointer_v<F>>>
decltype(auto) invoke(F ptr, T && object, Ts && ... args)
{
return (std::forward<T>(object).*ptr)(std::forward<Ts>(args)...);
}
template < typename F, typename... Ts, typename = std::enable_if_t < ! std::is_member_pointer_v<std::decay_t<F>>>>
decltype(auto) invoke(F && func, Ts && ... args)
{
return std::forward<F>(func)(std::forward<Ts>(args)...);
}
// 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, std::index_sequence<Is...>, std::true_type)

2
src/blackmisc/metaclass.h
View File

@@ -174,7 +174,7 @@ namespace BlackMisc
template <typename T, typename... Ts>
decltype(auto) in(T &&object, Ts &&... args) const
{
return Private::invoke(m_ptr, std::forward<T>(object), std::forward<Ts>(args)...);
return std::invoke(m_ptr, std::forward<T>(object), std::forward<Ts>(args)...);
}
//! Return name as QLatin1String.