diff options
| author |  liamwhite | 2023-02-15 17:42:38 -0500 |
|---|---|---|
| committer |  GitHub | 2023-02-15 17:42:38 -0500 |
| commit | 04d2d2ef5fdd56baa0ecf60e59ea4e915262161d (patch) | |
| tree | 3951ff8988fff573acd7f2b4edf5d95774b3721d /src/input_common/drivers/joycon.cpp | |
| parent | Merge pull request #9809 from liamwhite/unused-service (diff) | |
| parent | remove constexpr from virtual function (diff) | |
| download | yuzu-04d2d2ef5fdd56baa0ecf60e59ea4e915262161d.tar.gz yuzu-04d2d2ef5fdd56baa0ecf60e59ea4e915262161d.tar.xz yuzu-04d2d2ef5fdd56baa0ecf60e59ea4e915262161d.zip | |
Merge pull request #9782 from arades79/fix-consexpr-value-declaration-usage
Fix consexpr value declaration usage
Diffstat (limited to 'src/input_common/drivers/joycon.cpp')
| -rw-r--r-- | src/input_common/drivers/joycon.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/input_common/drivers/joycon.cpp b/src/input_common/drivers/joycon.cpp index afc33db57..b4cd39a20 100644 --- a/src/input_common/drivers/joycon.cpp +++ b/src/input_common/drivers/joycon.cpp | |||
| @@ -390,7 +390,7 @@ void Joycons::OnMotionUpdate(std::size_t port, Joycon::ControllerType type, int | |||
| 390 | void Joycons::OnRingConUpdate(f32 ring_data) { | 390 | void Joycons::OnRingConUpdate(f32 ring_data) { |
| 391 | // To simplify ring detection it will always be mapped to an empty identifier for all | 391 | // To simplify ring detection it will always be mapped to an empty identifier for all |
| 392 | // controllers | 392 | // controllers |
| 393 | constexpr PadIdentifier identifier = { | 393 | static constexpr PadIdentifier identifier = { |
| 394 | .guid = Common::UUID{}, | 394 | .guid = Common::UUID{}, |
| 395 | .port = 0, | 395 | .port = 0, |
| 396 | .pad = 0, | 396 | .pad = 0, |