From 774622d93fa5af8b56d7cfb48ac24532c381a97e Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Sun, 10 Oct 2021 21:37:29 -0700 Subject: [PATCH] loader: refactor to remove fake namespaces --- .../stratosphere/ldr/impl/ldr_debug_monitor_interface.hpp | 4 ++-- .../include/stratosphere/ldr/impl/ldr_shell_interface.hpp | 4 ++-- .../include/stratosphere/util/util_singleton_traits.hpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libstratosphere/include/stratosphere/ldr/impl/ldr_debug_monitor_interface.hpp b/libstratosphere/include/stratosphere/ldr/impl/ldr_debug_monitor_interface.hpp index 319832d3..39db27f8 100644 --- a/libstratosphere/include/stratosphere/ldr/impl/ldr_debug_monitor_interface.hpp +++ b/libstratosphere/include/stratosphere/ldr/impl/ldr_debug_monitor_interface.hpp @@ -20,8 +20,8 @@ #include #define AMS_LDR_I_DEBUG_MONITOR_INTERFACE_INTERFACE_INFO(C, H) \ - AMS_SF_METHOD_INFO(C, H, 0, Result, SetProgramArgumentsDeprecated, (ncm::ProgramId program_id, const sf::InPointerBuffer &args, u32 args_size), (program_id, args, args_size), hos::Version_Min, hos::Version_10_2_0) \ - AMS_SF_METHOD_INFO(C, H, 0, Result, SetProgramArguments, (ncm::ProgramId program_id, const sf::InPointerBuffer &args), (program_id, args), hos::Version_11_0_0 ) \ + AMS_SF_METHOD_INFO(C, H, 0, Result, SetProgramArgumentDeprecated, (ncm::ProgramId program_id, const sf::InPointerBuffer &args, u32 args_size), (program_id, args, args_size), hos::Version_Min, hos::Version_10_2_0) \ + AMS_SF_METHOD_INFO(C, H, 0, Result, SetProgramArgument, (ncm::ProgramId program_id, const sf::InPointerBuffer &args), (program_id, args), hos::Version_11_0_0 ) \ AMS_SF_METHOD_INFO(C, H, 1, Result, FlushArguments, (), ()) \ AMS_SF_METHOD_INFO(C, H, 2, Result, GetProcessModuleInfo, (sf::Out count, const sf::OutPointerArray &out, os::ProcessId process_id), (count, out, process_id)) \ AMS_SF_METHOD_INFO(C, H, 65000, void, AtmosphereHasLaunchedBootProgram, (sf::Out out, ncm::ProgramId program_id), (out, program_id)) diff --git a/libstratosphere/include/stratosphere/ldr/impl/ldr_shell_interface.hpp b/libstratosphere/include/stratosphere/ldr/impl/ldr_shell_interface.hpp index 2283dd63..972d20c7 100644 --- a/libstratosphere/include/stratosphere/ldr/impl/ldr_shell_interface.hpp +++ b/libstratosphere/include/stratosphere/ldr/impl/ldr_shell_interface.hpp @@ -20,8 +20,8 @@ #include #define AMS_LDR_I_SHELL_INTERFACE_INTERFACE_INFO(C, H) \ - AMS_SF_METHOD_INFO(C, H, 0, Result, SetProgramArgumentsDeprecated, (ncm::ProgramId program_id, const sf::InPointerBuffer &args, u32 args_size), (program_id, args, args_size), hos::Version_Min, hos::Version_10_2_0) \ - AMS_SF_METHOD_INFO(C, H, 0, Result, SetProgramArguments, (ncm::ProgramId program_id, const sf::InPointerBuffer &args), (program_id, args), hos::Version_11_0_0 ) \ + AMS_SF_METHOD_INFO(C, H, 0, Result, SetProgramArgumentDeprecated, (ncm::ProgramId program_id, const sf::InPointerBuffer &args, u32 args_size), (program_id, args, args_size), hos::Version_Min, hos::Version_10_2_0) \ + AMS_SF_METHOD_INFO(C, H, 0, Result, SetProgramArgument, (ncm::ProgramId program_id, const sf::InPointerBuffer &args), (program_id, args), hos::Version_11_0_0 ) \ AMS_SF_METHOD_INFO(C, H, 1, Result, FlushArguments, (), ()) \ AMS_SF_METHOD_INFO(C, H, 65000, Result, AtmosphereRegisterExternalCode, (sf::OutMoveHandle out, ncm::ProgramId program_id), (out, program_id)) \ AMS_SF_METHOD_INFO(C, H, 65001, void, AtmosphereUnregisterExternalCode, (ncm::ProgramId program_id), (program_id)) diff --git a/libstratosphere/include/stratosphere/util/util_singleton_traits.hpp b/libstratosphere/include/stratosphere/util/util_singleton_traits.hpp index 052b6077..040dbe4a 100644 --- a/libstratosphere/include/stratosphere/util/util_singleton_traits.hpp +++ b/libstratosphere/include/stratosphere/util/util_singleton_traits.hpp @@ -55,4 +55,4 @@ /* Declare singleton instance variables. */ \ static constinit _CLASSNAME_ s_singleton_instance; \ return s_singleton_instance; \ - } \ No newline at end of file + }