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

fix MSVC build errors and warnings

Browse Source
This commit is contained in:
Jeffrey Quesnelle
2019-10-16 23:56:49 -04:00
parent eb856dffec
commit 423f854682
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
communication/message/flexray/control/flexraycontrolmessage.cpp
+2 -1
View File
@@ -1,6 +1,7 @@
#include <icsneo/communication/message/flexray/control/flexraycontrolmessage.h>
#include <cstring> // memcpy
#include <limits>
#include <algorithm>
using namespace icsneo;
@@ -8,7 +9,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 = 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 >> 8));
ret.push_back(uint8_t(op));