ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix error using string_view where string is expected. This needs to be fixed in json eventually.

This commit is contained in:
Stephen Anthony 2023-08-02 13:12:56 -02:30
parent 480f7ab9f0
commit 7c34bdd27b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/PhysicalJoystick.cxx
View File

@ -126,7 +126,7 @@ string PhysicalJoystick::getName(const PhysicalJoystick::Port _port) const
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PhysicalJoystick::Port PhysicalJoystick::getPort(string_view portName) const
PhysicalJoystick::Port PhysicalJoystick::getPort(const string& portName) const
{
static constexpr std::array<string_view,
static_cast<int>(PhysicalJoystick::Port::NUM_PORTS)> NAMES =

2
src/common/PhysicalJoystick.hxx
View File

@ -90,7 +90,7 @@ class PhysicalJoystick
// Convert from string to Port type and vice versa
string getName(const Port _port) const;
Port getPort(string_view portName) const;
Port getPort(const string& portName) const; // FIXME: allow string_view
friend ostream& operator<<(ostream& os, const PhysicalJoystick& s) {
os << " ID: " << s.ID << ", name: " << s.name << ", numaxis: " << s.numAxes