diff --git a/communication/message/flexray/control/flexraycontrolmessage.cpp b/communication/message/flexray/control/flexraycontrolmessage.cpp index c7ff439..934fce4 100644 --- a/communication/message/flexray/control/flexraycontrolmessage.cpp +++ b/communication/message/flexray/control/flexraycontrolmessage.cpp @@ -1,6 +1,7 @@ #include #include // memcpy #include +#include using namespace icsneo; @@ -8,7 +9,7 @@ std::vector FlexRayControlMessage::BuildBaseControlArgs(uint8_t control std::vector ret; ret.reserve(args.size() + 4); ret.push_back(controller); - const uint16_t size = uint16_t(std::min(args.size() + 1, size_t(std::numeric_limits::max()))); // Add 1 for the opcode + const uint16_t size = uint16_t((std::min)(args.size() + 1, size_t(std::numeric_limits::max()))); // Add 1 for the opcode ret.push_back(uint8_t(size)); ret.push_back(uint8_t(size >> 8)); ret.push_back(uint8_t(op)); diff --git a/communication/packet/flexraypacket.cpp b/communication/packet/flexraypacket.cpp index 54dcfdb..5a2b776 100644 --- a/communication/packet/flexraypacket.cpp +++ b/communication/packet/flexraypacket.cpp @@ -59,5 +59,8 @@ std::shared_ptr HardwareFlexRayPacket::DecodeToMessage(const std } bool HardwareFlexRayPacket::EncodeFromMessage(const FlexRayMessage& message, std::vector& bytestream, const device_eventhandler_t& report) { + (void)message; + (void)bytestream; + (void)report; return false; -} \ No newline at end of file +} diff --git a/include/icsneo/device/tree/plasion/plasion.h b/include/icsneo/device/tree/plasion/plasion.h index 3fbe129..17c62e8 100644 --- a/include/icsneo/device/tree/plasion/plasion.h +++ b/include/icsneo/device/tree/plasion/plasion.h @@ -21,7 +21,7 @@ protected: virtual bool isSupportedRXNetwork(const Network&) const override { return true; } virtual bool isSupportedTXNetwork(const Network&) const override { return true; } virtual void setupExtensions() override { - addExtension(std::make_shared(*this, 2)); + addExtension(std::make_shared(*this, (uint8_t)2)); } static const std::vector& GetSupportedNetworks() {