Fix wstring to string conversion warnings in SinowealthGMOWController.cpp
This commit is contained in:
parent
091c4e46f5
commit
aeca035fa3
1 changed files with 5 additions and 8 deletions
|
|
@ -6,11 +6,11 @@
|
|||
| Matt Silva (thesilvanator) 05/2022 |
|
||||
\*-------------------------------------------*/
|
||||
|
||||
#include "SinowealthGMOWController.h"
|
||||
#include <cstring>
|
||||
#include <LogManager.h>
|
||||
|
||||
#include <iostream>
|
||||
#include "LogManager.h"
|
||||
#include "SinowealthGMOWController.h"
|
||||
#include "StringUtils.h"
|
||||
|
||||
SinowealthGMOWController::SinowealthGMOWController(hid_device* dev_handle, char *_path, int _type)
|
||||
{
|
||||
|
|
@ -56,10 +56,7 @@ std::string SinowealthGMOWController::GetSerialString()
|
|||
return("");
|
||||
}
|
||||
|
||||
std::wstring return_wstring = serial_string;
|
||||
std::string return_string(return_wstring.begin(), return_wstring.end());
|
||||
|
||||
return(return_string);
|
||||
return(StringUtils::wstring_to_string(serial_string));
|
||||
}
|
||||
|
||||
std::string SinowealthGMOWController::GetFirmwareVersion()
|
||||
|
|
@ -233,4 +230,4 @@ void SinowealthGMOWController::SetMode(unsigned char mode,
|
|||
hid_send_feature_report(dev, less_buff, GMOW_PACKET_SIZE);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue