hwpplayer1/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

profile_manager: Make use of std::nullopt

Browse source 
Allows some implementations to completely avoid unnecessarily zeroing
out the internal buffer.
This commit is contained in:
Lioncash 2020-08-03 09:03:39 -04:00
parent 3fcaf937d2
commit b9831fd80a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/hle/service/acc/profile_manager.cpp
View file

@ -58,7 +58,7 @@ ProfileManager::~ProfileManager() {
/// internal management of the users profiles /// internal management of the users profiles
std::optional<std::size_t> ProfileManager::AddToProfiles(const ProfileInfo& profile) { std::optional<std::size_t> ProfileManager::AddToProfiles(const ProfileInfo& profile) {
if (user_count >= MAX_USERS) { if (user_count >= MAX_USERS) {
return {}; return std::nullopt;
} }
profiles[user_count] = profile; profiles[user_count] = profile;
return user_count++; return user_count++;
@ -127,7 +127,7 @@ ResultCode ProfileManager::CreateNewUser(UUID uuid, const std::string& username)
std::optional<UUID> ProfileManager::GetUser(std::size_t index) const { std::optional<UUID> ProfileManager::GetUser(std::size_t index) const {
if (index >= MAX_USERS) { if (index >= MAX_USERS) {
return {}; return std::nullopt;
} }
return profiles[index].user_uuid; return profiles[index].user_uuid;
@ -136,13 +136,13 @@ std::optional<UUID> ProfileManager::GetUser(std::size_t index) const {
/// Returns a users profile index based on their user id. /// Returns a users profile index based on their user id.
std::optional<std::size_t> ProfileManager::GetUserIndex(const UUID& uuid) const { std::optional<std::size_t> ProfileManager::GetUserIndex(const UUID& uuid) const {
if (!uuid) { if (!uuid) {
return {}; return std::nullopt;
} }
const auto iter = std::find_if(profiles.begin(), profiles.end(), const auto iter = std::find_if(profiles.begin(), profiles.end(),
[&uuid](const ProfileInfo& p) { return p.user_uuid == uuid; }); [&uuid](const ProfileInfo& p) { return p.user_uuid == uuid; });
if (iter == profiles.end()) { if (iter == profiles.end()) {
return {}; return std::nullopt;
} }
return static_cast<std::size_t>(std::distance(profiles.begin(), iter)); return static_cast<std::size_t>(std::distance(profiles.begin(), iter));