nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 20:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

sf: Improve class member function detection

Browse source
This commit is contained in:
Michael Scire 2019-12-09 19:02:53 -08:00
parent d4f99ddb4d
commit 9578622abf
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/libstratosphere/include/stratosphere/sf/impl/sf_impl_command_serialization.hpp
View file

@ -377,14 +377,15 @@ namespace ams::sf::impl {
static R GetReturnTypeImpl(R(C::*)(A...)); static R GetReturnTypeImpl(R(C::*)(A...));
template<typename R, typename C, typename... A> template<typename R, typename C, typename... A>
static C GetClassTypeImpl(R(C::*)(A...)); static C *GetClassTypePointerImpl(R(C::*)(A...));
template<typename R, typename C, typename... A> template<typename R, typename C, typename... A>
static std::tuple<typename std::decay<A>::type...> GetArgsImpl(R(C::*)(A...)); static std::tuple<typename std::decay<A>::type...> GetArgsImpl(R(C::*)(A...));
public: public:
using ReturnType = decltype(GetReturnTypeImpl(MemberFunction)); using ReturnType = decltype(GetReturnTypeImpl(MemberFunction));
using ClassType = decltype(GetClassTypeImpl(MemberFunction)); using ClassTypePointer = decltype(GetClassTypePointerImpl(MemberFunction));
using ArgsType = decltype(GetArgsImpl(MemberFunction)); using ArgsType = decltype(GetArgsImpl(MemberFunction));
using ClassType = typename std::remove_pointer<ClassTypePointer>::type;
static constexpr bool ReturnsResult = std::is_same<ReturnType, Result>::value; static constexpr bool ReturnsResult = std::is_same<ReturnType, Result>::value;
static constexpr bool ReturnsVoid = std::is_same<ReturnType, void>::value; static constexpr bool ReturnsVoid = std::is_same<ReturnType, void>::value;
@ -1067,8 +1068,7 @@ namespace ams::sf::impl {
using OutHandleHolderType = OutHandleHolder<CommandMeta::NumOutMoveHandles, CommandMeta::NumOutCopyHandles>; using OutHandleHolderType = OutHandleHolder<CommandMeta::NumOutMoveHandles, CommandMeta::NumOutCopyHandles>;
using OutRawHolderType = OutRawHolder<CommandMeta::OutDataSize, CommandMeta::OutDataAlign>; using OutRawHolderType = OutRawHolder<CommandMeta::OutDataSize, CommandMeta::OutDataAlign>;
using InOutObjectHolderType = InOutObjectHolder<CommandMeta::NumInObjects, CommandMeta::NumOutObjects>; using InOutObjectHolderType = InOutObjectHolder<CommandMeta::NumInObjects, CommandMeta::NumOutObjects>;
using ClassType = typename CommandMeta::ClassType; static_assert(std::is_base_of<sf::IServiceObject, typename CommandMeta::ClassType>::value, "InvokeServiceCommandImpl: Service Commands must be ServiceObject member functions");
static_assert(std::is_base_of<sf::IServiceObject, ClassType>::value, "InvokeServiceCommandImpl: Service Commands must be ServiceObject member functions");
/* Create a processor for us to work with. */ /* Create a processor for us to work with. */
ImplProcessorType impl_processor; ImplProcessorType impl_processor;
@ -1100,7 +1100,7 @@ namespace ams::sf::impl {
/* Decoding/Invocation. */ /* Decoding/Invocation. */
{ {
ClassType *this_ptr = static_cast<ClassType *>(ctx.srv_obj); typename CommandMeta::ClassTypePointer this_ptr = static_cast<typename CommandMeta::ClassTypePointer>(ctx.srv_obj);
typename CommandMeta::ArgsType args_tuple = ImplProcessorType::DeserializeArguments(ctx, in_raw_data, out_raw_holder, buffers, out_handles_holder, in_out_objects_holder); typename CommandMeta::ArgsType args_tuple = ImplProcessorType::DeserializeArguments(ctx, in_raw_data, out_raw_holder, buffers, out_handles_holder, in_out_objects_holder);
/* Handle in process ID holder if relevant. */ /* Handle in process ID holder if relevant. */