summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/InputConfig.cpp
diff options
context:
space:
mode:
authorDavid Korth <gerbilsoft@gerbilsoft.com>2019-09-24 00:32:43 -0400
committerDavid Korth <gerbilsoft@gerbilsoft.com>2019-12-29 23:45:02 -0500
commit6e549bb6689d967edf4e16f061500f696f35906c (patch)
treeb6b4abd08b82dfa2624bc7475425aedcb68f055d /Source/Core/InputCommon/InputConfig.cpp
parenta23b3d26f407ee9647e49f2802c5da5d26e752ad (diff)
InputConfig::LoadConfig(): Convert num[] to an array of std::string_view.
NOTE: The explicit std::string() conversions later are needed. Otherwise, gcc-9.2.0 throws all sorts of errors because it can't find a matching operator+() function.
Diffstat (limited to 'Source/Core/InputCommon/InputConfig.cpp')
-rw-r--r--Source/Core/InputCommon/InputConfig.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp
index a1826f46d1..24330575e1 100644
--- a/Source/Core/InputCommon/InputConfig.cpp
+++ b/Source/Core/InputCommon/InputConfig.cpp
@@ -30,7 +30,7 @@ bool InputConfig::LoadConfig(bool isGC)
{
IniFile inifile;
bool useProfile[MAX_BBMOTES] = {false, false, false, false, false};
- std::string num[MAX_BBMOTES] = {"1", "2", "3", "4", "BB"};
+ static constexpr std::array<std::string_view, MAX_BBMOTES> num = {"1", "2", "3", "4", "BB"};
std::string profile[MAX_BBMOTES];
std::string path;
@@ -58,10 +58,10 @@ bool InputConfig::LoadConfig(bool isGC)
for (int i = 0; i < 4; i++)
{
- if (control_section->Exists(type + "Profile" + num[i]))
+ if (control_section->Exists(type + "Profile" + std::string(num[i])))
{
std::string profile_setting;
- if (control_section->Get(type + "Profile" + num[i], &profile_setting))
+ if (control_section->Get(type + "Profile" + std::string(num[i]), &profile_setting))
{
auto profiles = InputProfile::GetProfilesFromSetting(
profile_setting, File::GetUserPath(D_CONFIG_IDX) + path);