From 5ebd95b72ac56814af85ac1607cf0636048a169d Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Wed, 7 Aug 2024 21:43:32 -0500 Subject: [PATCH] Fix wstring to string conversion warning in MSIMysticLight185Controller.cpp --- .../MSIMysticLight185Controller.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Controllers/MSIMysticLightController/MSIMysticLight185Controller/MSIMysticLight185Controller.cpp b/Controllers/MSIMysticLightController/MSIMysticLight185Controller/MSIMysticLight185Controller.cpp index ea59c670..70521a30 100644 --- a/Controllers/MSIMysticLightController/MSIMysticLight185Controller/MSIMysticLight185Controller.cpp +++ b/Controllers/MSIMysticLightController/MSIMysticLight185Controller/MSIMysticLight185Controller.cpp @@ -1053,10 +1053,9 @@ void MSIMysticLight185Controller::ReadName() hid_get_manufacturer_string(dev, tname, 256); /*-----------------------------------------------------*\ - | Convert wchar_t into std::wstring into std::string | + | Convert to std::string | \*-----------------------------------------------------*/ - std::wstring wname = std::wstring(tname); - name = std::string(wname.begin(), wname.end()); + name = StringUtils::wstring_to_string(tname); /*-----------------------------------------------------*\ | Get the product string from HID | @@ -1066,8 +1065,7 @@ void MSIMysticLight185Controller::ReadName() /*-----------------------------------------------------*\ | Append the product string to the manufacturer string | \*-----------------------------------------------------*/ - wname = std::wstring(tname); - name.append(" ").append(std::string(wname.begin(), wname.end())); + name.append(" ").append(StringUtils::wstring_to_string(tname)); } MSI_MODE MSIMysticLight185Controller::GetMode()