sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 01:18:36 +02:00
Code Issues Projects Releases Wiki Activity

Quiet down warnings on Windows

Browse Source
This commit is contained in:
Paul Hollinsky
2019-10-16 17:43:11 -04:00
parent debaf8f0cb
commit eb856dffec
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
communication/message/flexray/control/flexraycontrolmessage.cpp
+2 -1
View File
@@ -1,5 +1,6 @@
#include <icsneo/communication/message/flexray/control/flexraycontrolmessage.h>
#include <cstring> // memcpy
#include <limits>
using namespace icsneo;
@@ -7,7 +8,7 @@ std::vector<uint8_t> FlexRayControlMessage::BuildBaseControlArgs(uint8_t control
std::vector<uint8_t> ret;
ret.reserve(args.size() + 4);
ret.push_back(controller);
const uint16_t size = args.size() + 1; // 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 >> 8));
ret.push_back(uint8_t(op));
communication/packet/flexraypacket.cpp
+2 -2
View File
@@ -31,7 +31,7 @@ std::shared_ptr<FlexRayMessage> HardwareFlexRayPacket::DecodeToMessage(const std
}
uint32_t numBytes = data->payload_len * 2;
if(ssize_t(numBytes) >= ssize_t(data->Length) - 4) {
if(int64_t(numBytes) >= int64_t(data->Length) - 4) {
if(data->statusBits.bits.fcrc_error)
msg->crcStatus = FlexRay::CRCStatus::Error;
} else {
@@ -47,7 +47,7 @@ std::shared_ptr<FlexRayMessage> HardwareFlexRayPacket::DecodeToMessage(const std
msg->sync = data->sync;
msg->startup = data->startup;
msg->id = data->id;
if(ssize_t(numBytes) != ssize_t(data->Length) - 4) {
if(int64_t(numBytes) != int64_t(data->Length) - 4) {
} else {
// This is an error, probably need to flag it