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/helpers/joycon_protocol/nfc.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'src/input_common/helpers/joycon_protocol/nfc.cpp')
diff --git a/src/input_common/helpers/joycon_protocol/nfc.cpp b/src/input_common/helpers/joycon_protocol/nfc.cpp
index eeba829860..6b8f38aec3 100644
--- a/src/input_common/helpers/joycon_protocol/nfc.cpp
+++ b/src/input_common/helpers/joycon_protocol/nfc.cpp
@@ -109,7 +109,7 @@ bool NfcProtocol::HasAmiibo() {
}
DriverResult NfcProtocol::WaitUntilNfcIsReady() {
- constexpr std::size_t timeout_limit = 10;
+ constexpr static std::size_t timeout_limit = 10;
MCUCommandResponse output{};
std::size_t tries = 0;
@@ -131,7 +131,7 @@ DriverResult NfcProtocol::WaitUntilNfcIsReady() {
DriverResult NfcProtocol::StartPolling(TagFoundData& data) {
LOG_DEBUG(Input, "Start Polling for tag");
- constexpr std::size_t timeout_limit = 7;
+ constexpr static std::size_t timeout_limit = 7;
MCUCommandResponse output{};
std::size_t tries = 0;
@@ -155,7 +155,7 @@ DriverResult NfcProtocol::StartPolling(TagFoundData& data) {
}
DriverResult NfcProtocol::ReadTag(const TagFoundData& data) {
- constexpr std::size_t timeout_limit = 10;
+ constexpr static std::size_t timeout_limit = 10;
MCUCommandResponse output{};
std::size_t tries = 0;
@@ -224,7 +224,7 @@ DriverResult NfcProtocol::ReadTag(const TagFoundData& data) {
}
DriverResult NfcProtocol::GetAmiiboData(std::vector<u8>& ntag_data) {
- constexpr std::size_t timeout_limit = 10;
+ constexpr static std::size_t timeout_limit = 10;
MCUCommandResponse output{};
std::size_t tries = 0;
--
cgit v1.2.3-70-g09d2