From ad07af160c14cafc2128d880915d72be77da3073 Mon Sep 17 00:00:00 2001 From: Paul Hollinsky Date: Sat, 22 May 2021 11:31:19 -0400 Subject: [PATCH] MSVC: Variable shadowing --- include/icsneo/device/tree/neovifire2/neovifire2.h | 5 ++--- include/icsneo/device/tree/plasion/plasion.h | 5 ++--- include/icsneo/device/tree/radgalaxy/radgalaxy.h | 5 ++--- include/icsneo/device/tree/radgigalog/radgigalog.h | 5 ++--- include/icsneo/device/tree/radgigastar/radgigastar.h | 5 ++--- include/icsneo/device/tree/valuecan4/valuecan4-2el.h | 5 ++--- 6 files changed, 12 insertions(+), 18 deletions(-) diff --git a/include/icsneo/device/tree/neovifire2/neovifire2.h b/include/icsneo/device/tree/neovifire2/neovifire2.h index ec9ae3c..8904e7e 100644 --- a/include/icsneo/device/tree/neovifire2/neovifire2.h +++ b/include/icsneo/device/tree/neovifire2/neovifire2.h @@ -105,11 +105,10 @@ protected: virtual void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } void handleDeviceStatus(const std::shared_ptr& message) override { - const auto& data = message->data; - if(data.size() < sizeof(neovifire2_status_t)) + if(message->data.size() < sizeof(neovifire2_status_t)) return; std::lock_guard lk(ioMutex); - const neovifire2_status_t* status = reinterpret_cast(data.data()); + const neovifire2_status_t* status = reinterpret_cast(message->data.data()); backupPowerEnabled = status->backupPowerEnabled; backupPowerGood = status->backupPowerGood; ethActivationStatus = status->ethernetActivationLineEnabled; diff --git a/include/icsneo/device/tree/plasion/plasion.h b/include/icsneo/device/tree/plasion/plasion.h index 6ed13c5..8afbe29 100644 --- a/include/icsneo/device/tree/plasion/plasion.h +++ b/include/icsneo/device/tree/plasion/plasion.h @@ -81,11 +81,10 @@ protected: } void handleDeviceStatus(const std::shared_ptr& message) override { - const auto& data = message->data; - if(data.size() < sizeof(fire2vnet_status_t)) + if(message->data.size() < sizeof(fire2vnet_status_t)) return; std::lock_guard lk(ioMutex); - const fire2vnet_status_t* status = reinterpret_cast(data.data()); + const fire2vnet_status_t* status = reinterpret_cast(message->data.data()); ethActivationStatus = status->ethernetActivationLineEnabled; } diff --git a/include/icsneo/device/tree/radgalaxy/radgalaxy.h b/include/icsneo/device/tree/radgalaxy/radgalaxy.h index f2f2cdd..e534216 100644 --- a/include/icsneo/device/tree/radgalaxy/radgalaxy.h +++ b/include/icsneo/device/tree/radgalaxy/radgalaxy.h @@ -119,11 +119,10 @@ protected: void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } void handleDeviceStatus(const std::shared_ptr& message) override { - const auto& data = message->data; - if(data.size() < sizeof(radgalaxy_status_t)) + if(message->data.size() < sizeof(radgalaxy_status_t)) return; std::lock_guard lk(ioMutex); - const radgalaxy_status_t* status = reinterpret_cast(data.data()); + const radgalaxy_status_t* status = reinterpret_cast(message->data.data()); ethActivationStatus = status->ethernetActivationLineEnabled; } }; diff --git a/include/icsneo/device/tree/radgigalog/radgigalog.h b/include/icsneo/device/tree/radgigalog/radgigalog.h index 2b155a0..760decd 100644 --- a/include/icsneo/device/tree/radgigalog/radgigalog.h +++ b/include/icsneo/device/tree/radgigalog/radgigalog.h @@ -78,11 +78,10 @@ protected: } void handleDeviceStatus(const std::shared_ptr& message) override { - const auto& data = message->data; - if(data.size() < sizeof(radgigalog_status_t)) + if(message->data.size() < sizeof(radgigalog_status_t)) return; std::lock_guard lk(ioMutex); - const radgigalog_status_t* status = reinterpret_cast(data.data()); + const radgigalog_status_t* status = reinterpret_cast(message->data.data()); ethActivationStatus = status->ethernetActivationLineEnabled; } }; diff --git a/include/icsneo/device/tree/radgigastar/radgigastar.h b/include/icsneo/device/tree/radgigastar/radgigastar.h index 61b091b..a4e79f2 100644 --- a/include/icsneo/device/tree/radgigastar/radgigastar.h +++ b/include/icsneo/device/tree/radgigastar/radgigastar.h @@ -82,11 +82,10 @@ protected: } void handleDeviceStatus(const std::shared_ptr& message) override { - const auto& data = message->data; - if(data.size() < sizeof(radgigastar_status_t)) + if(message->data.size() < sizeof(radgigastar_status_t)) return; std::lock_guard lk(ioMutex); - const radgigastar_status_t* status = reinterpret_cast(data.data()); + const radgigastar_status_t* status = reinterpret_cast(message->data.data()); ethActivationStatus = status->ethernetActivationLineEnabled; } }; diff --git a/include/icsneo/device/tree/valuecan4/valuecan4-2el.h b/include/icsneo/device/tree/valuecan4/valuecan4-2el.h index cda4200..995509b 100644 --- a/include/icsneo/device/tree/valuecan4/valuecan4-2el.h +++ b/include/icsneo/device/tree/valuecan4/valuecan4-2el.h @@ -74,11 +74,10 @@ protected: size_t getEthernetActivationLineCount() const override { return 1; } void handleDeviceStatus(const std::shared_ptr& message) override { - const auto& data = message->data; - if(data.size() < sizeof(valuecan4_2el_status_t)) + if(message->data.size() < sizeof(valuecan4_2el_status_t)) return; std::lock_guard lk(ioMutex); - const valuecan4_2el_status_t* status = reinterpret_cast(data.data()); + const valuecan4_2el_status_t* status = reinterpret_cast(message->data.data()); ethActivationStatus = status->ethernetActivationLineEnabled; } };