Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4796 from lioncash/clang

Browse source 
core: Fix clang build
This commit is contained in:
LC 2020-10-20 19:19:12 -04:00 • committed by GitHub
commit 88d5140cf2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
105 changed files with 906 additions and 667 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,12 +41,15 @@ constexpr char ACC_SAVE_AVATORS_BASE_PATH[] = "/system/save/8000000000000010/su/
ProfileManager::ProfileManager() {
ParseUserSaveFile();
if (user_count == 0)
if (user_count == 0) {
CreateNewUser(UUID::Generate(), "yuzu");
}
auto current = std::clamp<int>(Settings::values.current_user, 0, MAX_USERS - 1);
if (UserExistsIndex(current))
auto current = static_cast<size_t>(
std::clamp(Settings::values.current_user, 0, static_cast<s32>(MAX_USERS - 1)));
if (UserExistsIndex(current)) {
current = 0;
}
OpenUser(*GetUser(current));
}
@ -189,8 +192,8 @@ std::size_t ProfileManager::GetUserCount() const {
/// booting
std::size_t ProfileManager::GetOpenUserCount() const {
return std::count_if(profiles.begin(), profiles.end(),
[](const ProfileInfo& p) { return p.is_open; });
return static_cast<std::size_t>(std::count_if(profiles.begin(), profiles.end(),
[](const ProfileInfo& p) { return p.is_open; }));
}
/// Checks if a user id exists in our profile manager