From bb2f22eaa9b5a977bee98f7099f5a59d2e90ee3c Mon Sep 17 00:00:00 2001 From: Martin Zink Date: Thu, 25 Jan 2024 18:41:19 +0100 Subject: [PATCH] build fix --- extensions/standard-processors/modbus/Error.h | 3 ++- extensions/standard-processors/modbus/ReadModbusFunctions.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/extensions/standard-processors/modbus/Error.h b/extensions/standard-processors/modbus/Error.h index 5b349f8dd24..38c05eed632 100644 --- a/extensions/standard-processors/modbus/Error.h +++ b/extensions/standard-processors/modbus/Error.h @@ -49,7 +49,8 @@ struct ModbusErrorCategory final : std::error_category { } [[nodiscard]] std::string message(int ev) const override { - return std::string{magic_enum::enum_name(ModbusExceptionCode{ev})}; + const auto modbus_exception_code = static_cast(ev); + return std::string{magic_enum::enum_name(modbus_exception_code)}; } }; diff --git a/extensions/standard-processors/modbus/ReadModbusFunctions.h b/extensions/standard-processors/modbus/ReadModbusFunctions.h index a32f4d88d38..3ca1a0553a6 100644 --- a/extensions/standard-processors/modbus/ReadModbusFunctions.h +++ b/extensions/standard-processors/modbus/ReadModbusFunctions.h @@ -57,7 +57,7 @@ class ReadModbusFunction { return nonstd::make_unexpected(ModbusExceptionCode::InvalidResponse); } - return ranges::subrange(resp_pdu.begin() + 2, resp_pdu.end()); + return ranges::subrange::const_iterator>(resp_pdu.begin() + 2, resp_pdu.end()); } [[nodiscard]] virtual std::byte getFunctionCode() const = 0; @@ -92,7 +92,7 @@ class ReadCoilStatus final : public ReadModbusFunction { if (coils.size() == number_of_points_) { break; } - const bool bit_value = static_cast((resp_byte & std::byte{unsigned{1} << i}) >> i); + const bool bit_value = static_cast((resp_byte & (std::byte{1} << i)) >> i); coils.push_back(bit_value); } }