sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix MSVC build errors and warnings

checksum-failure-logging
Jeffrey Quesnelle 2019-10-16 23:56:49 -04:00
parent eb856dffec
commit 423f854682
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
communication/message/flexray/control/flexraycontrolmessage.cpp
View File

@ -1,6 +1,7 @@
#include <icsneo/communication/message/flexray/control/flexraycontrolmessage.h> #include <icsneo/communication/message/flexray/control/flexraycontrolmessage.h>
#include <cstring> // memcpy #include <cstring> // memcpy
#include <limits> #include <limits>
#include <algorithm>
using namespace icsneo; using namespace icsneo;
@ -8,7 +9,7 @@ std::vector<uint8_t> FlexRayControlMessage::BuildBaseControlArgs(uint8_t control
std::vector<uint8_t> ret; std::vector<uint8_t> ret;
ret.reserve(args.size() + 4); ret.reserve(args.size() + 4);
ret.push_back(controller); ret.push_back(controller);
const uint16_t size = uint16_t(std::min(args.size() + 1, size_t(std::numeric_limits<uint16_t>::max()))); // Add 1 for the opcode const uint16_t size = uint16_t((std::min)(args.size() + 1, size_t(std::numeric_limits<uint16_t>::max()))); // Add 1 for the opcode
ret.push_back(uint8_t(size)); ret.push_back(uint8_t(size));
ret.push_back(uint8_t(size >> 8)); ret.push_back(uint8_t(size >> 8));
ret.push_back(uint8_t(op)); ret.push_back(uint8_t(op));

5
communication/packet/flexraypacket.cpp
View File

@ -59,5 +59,8 @@ std::shared_ptr<FlexRayMessage> HardwareFlexRayPacket::DecodeToMessage(const std
} }
bool HardwareFlexRayPacket::EncodeFromMessage(const FlexRayMessage& message, std::vector<uint8_t>& bytestream, const device_eventhandler_t& report) { bool HardwareFlexRayPacket::EncodeFromMessage(const FlexRayMessage& message, std::vector<uint8_t>& bytestream, const device_eventhandler_t& report) {
(void)message;
(void)bytestream;
(void)report;
return false; return false;
} }

2
include/icsneo/device/tree/plasion/plasion.h
View File

@ -21,7 +21,7 @@ protected:
virtual bool isSupportedRXNetwork(const Network&) const override { return true; } virtual bool isSupportedRXNetwork(const Network&) const override { return true; }
virtual bool isSupportedTXNetwork(const Network&) const override { return true; } virtual bool isSupportedTXNetwork(const Network&) const override { return true; }
virtual void setupExtensions() override { virtual void setupExtensions() override {
addExtension(std::make_shared<FlexRay::Extension>(*this, 2)); addExtension(std::make_shared<FlexRay::Extension>(*this, (uint8_t)2));
} }
static const std::vector<Network>& GetSupportedNetworks() { static const std::vector<Network>& GetSupportedNetworks() {