From b9831fd80afb3cf707d1b0fe2b1d7288adc4605a Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 3 Aug 2020 09:03:39 -0400 Subject: profile_manager: Make use of std::nullopt Allows some implementations to completely avoid unnecessarily zeroing out the internal buffer. --- src/core/hle/service/acc/profile_manager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp index 3867ca29a..a98d57b5c 100644 --- a/src/core/hle/service/acc/profile_manager.cpp +++ b/src/core/hle/service/acc/profile_manager.cpp @@ -58,7 +58,7 @@ ProfileManager::~ProfileManager() { /// internal management of the users profiles std::optional ProfileManager::AddToProfiles(const ProfileInfo& profile) { if (user_count >= MAX_USERS) { - return {}; + return std::nullopt; } profiles[user_count] = profile; return user_count++; @@ -127,7 +127,7 @@ ResultCode ProfileManager::CreateNewUser(UUID uuid, const std::string& username) std::optional ProfileManager::GetUser(std::size_t index) const { if (index >= MAX_USERS) { - return {}; + return std::nullopt; } return profiles[index].user_uuid; @@ -136,13 +136,13 @@ std::optional ProfileManager::GetUser(std::size_t index) const { /// Returns a users profile index based on their user id. std::optional ProfileManager::GetUserIndex(const UUID& uuid) const { if (!uuid) { - return {}; + return std::nullopt; } const auto iter = std::find_if(profiles.begin(), profiles.end(), [&uuid](const ProfileInfo& p) { return p.user_uuid == uuid; }); if (iter == profiles.end()) { - return {}; + return std::nullopt; } return static_cast(std::distance(profiles.begin(), iter)); -- cgit v1.2.3