piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13363 from JoshuaVandaele/nowarnings

Browse Source 
Fix multiple minor warnings
This commit is contained in:
JMC47
2025-03-10 15:04:14 -04:00
committed by GitHub
parent 3f73a39dbd 5b4d4ca5eb
commit 189d09011b
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/NetPlayClient.cpp
View File

@ -4,6 +4,7 @@
#include "Core/NetPlayClient.h"
#include <algorithm>
#include <array>
#include <cstddef>
#include <cstring>
#include <fstream>
@ -2668,9 +2669,10 @@ std::string GetPlayerMappingString(PlayerId pid, const PadMappingArray& pad_map,
wiimote_slots.push_back(i + 1);
}
std::vector<std::string> groups;
for (const auto& [group_name, slots] :
{std::make_pair("GC", &gc_slots), std::make_pair("GBA", &gba_slots),
std::make_pair("Wii", &wiimote_slots)})
std::array<std::pair<std::string, std::vector<size_t>*>, 3> slot_groups = {
{{"GC", &gc_slots}, {"GBA", &gba_slots}, {"Wii", &wiimote_slots}}};
for (const auto& [group_name, slots] : slot_groups)
{
if (!slots->empty())
groups.emplace_back(fmt::format("{}{}", group_name, fmt::join(*slots, ",")));