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

ams: convert to util::ConstructAt where appropriate

Browse source
This commit is contained in:
Michael Scire 2021-03-21 20:36:49 -07:00
parent d84dcb653d
commit c99ce36d7d
4 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/libstratosphere/source/fs/fs_code.cpp
View file

@ -40,12 +40,10 @@ namespace ams::fs {
/* Setup the storage. */
/* NOTE: This owns the file, and so on failure it will be closed appropriately. */
std::construct_at(GetPointer(g_stratosphere_romfs_storage), stratosphere_romfs_file, true);
auto storage_guard = SCOPE_GUARD { std::destroy_at(GetPointer(g_stratosphere_romfs_storage)); };
auto storage_guard = util::ConstructAtGuarded(g_stratosphere_romfs_storage, stratosphere_romfs_file, true);
/* Create the filesystem. */
std::construct_at(GetPointer(g_stratosphere_romfs_fs));
auto fs_guard = SCOPE_GUARD { std::destroy_at(GetPointer(g_stratosphere_romfs_fs)); };
auto fs_guard = util::ConstructAtGuarded(g_stratosphere_romfs_fs);
/* Initialize the filesystem. */
R_TRY(GetReference(g_stratosphere_romfs_fs).Initialize(GetPointer(g_stratosphere_romfs_storage), nullptr, 0, false));

7
libraries/libstratosphere/source/htc/server/htc_htcmisc_hipc_server.cpp
View file

@ -39,11 +39,8 @@ namespace ams::htc::server {
/* Check that we haven't already initialized. */
AMS_ASSERT(g_server_manager == nullptr);
/* Create the server manager. */
std::construct_at(GetPointer(g_server_manager_storage));
/* Set the server manager pointer. */
g_server_manager = GetPointer(g_server_manager_storage);
/* Create/Set the server manager pointer. */
g_server_manager = util::ConstructAt(g_server_manager_storage);
/* Create and register the htc manager object. */
HtcServiceObject *service_object;

4
libraries/libstratosphere/source/htcfs/htcfs_client.cpp
View file

@ -28,13 +28,13 @@ namespace ams::htcfs {
void InitializeClient(htclow::HtclowManager *manager) {
AMS_ASSERT(!g_initialized);
std::construct_at(GetPointer(g_client_storage), manager);
util::ConstructAt(g_client_storage, manager);
}
void FinalizeClient() {
AMS_ASSERT(g_initialized);
std::destroy_at(GetPointer(g_client_storage));
util::DestroyAt(g_client_storage);
}
Client &GetClient() {

2
libraries/libstratosphere/source/htclow/mux/htclow_mux_channel_impl_map.cpp
View file

@ -56,7 +56,7 @@ namespace ams::htclow::mux {
R_UNLESS(idx < MaxChannelCount, htclow::ResultOutOfChannel());
/* Create the channel impl. */
std::construct_at(GetPointer(m_channel_storage[idx]), channel, m_packet_factory, m_state_machine, m_task_manager, m_event);
util::ConstructAt(m_channel_storage[idx], channel, m_packet_factory, m_state_machine, m_task_manager, m_event);
/* Mark the storage valid. */
m_storage_valid[idx] = true;