From 45e13b03f372230dbf780f3fa87dd88f388af605 Mon Sep 17 00:00:00 2001
From: arades79 <scravers@protonmail.com>
Date: Sat, 11 Feb 2023 13:28:03 -0500
Subject: add static lifetime to constexpr values to force compile time
evaluation where possible
Signed-off-by: arades79 <scravers@protonmail.com>
---
src/input_common/drivers/joycon.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'src/input_common/drivers/joycon.cpp')
diff --git a/src/input_common/drivers/joycon.cpp b/src/input_common/drivers/joycon.cpp
index afc33db572..a93bb5c25b 100644
--- a/src/input_common/drivers/joycon.cpp
+++ b/src/input_common/drivers/joycon.cpp
@@ -77,7 +77,7 @@ void Joycons::Setup() {
}
void Joycons::ScanThread(std::stop_token stop_token) {
- constexpr u16 nintendo_vendor_id = 0x057e;
+ constexpr static u16 nintendo_vendor_id = 0x057e;
Common::SetCurrentThreadName("JoyconScanThread");
do {
@@ -390,7 +390,7 @@ void Joycons::OnMotionUpdate(std::size_t port, Joycon::ControllerType type, int
void Joycons::OnRingConUpdate(f32 ring_data) {
// To simplify ring detection it will always be mapped to an empty identifier for all
// controllers
- constexpr PadIdentifier identifier = {
+ constexpr static PadIdentifier identifier = {
.guid = Common::UUID{},
.port = 0,
.pad = 0,
--
cgit v1.2.3-70-g09d2