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

Resolve Linux build issues and warnings

Browse Source
This commit is contained in:
Paul Hollinsky
2018-10-17 15:13:28 -04:00
parent ae5646dd78
commit 4426334f3f
5 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
communication/message/include/neomessage.h
+3 -1
View File
@@ -102,6 +102,7 @@ typedef struct {
uint8_t type;
uint8_t reserved[9];
} neomessage_t;
// Any time you add another neomessage_*_t type, make sure to add it to the static_asserts below!
typedef struct {
neomessage_statusbitfield_t status;
@@ -113,13 +114,14 @@ typedef struct {
uint8_t type;
char reserved[9];
} neomessage_can_t;
static_assert(sizeof(neomessage_can_t) == sizeof(neomessage_t), "All types of neomessage_t must be the same size!");
#pragma pack(pop)
#ifdef __cplusplus
#include "communication/message/include/message.h"
static_assert(sizeof(neomessage_can_t) == sizeof(neomessage_t), "All types of neomessage_t must be the same size!");
namespace icsneo {
neomessage_t CreateNeoMessage(const Message& message);
communication/message/neomessage.cpp
+1 -1
View File
@@ -7,7 +7,7 @@ neomessage_t icsneo::CreateNeoMessage(const Message& message) {
// This function is not responsible for storing the message!
// Keep the shared_ptr around for the lifetime of the data access
const auto type = message.network.getType();
neomessage_t neomsg = { 0 }; // Clear out the memory
neomessage_t neomsg = {}; // Clear out the memory
neomsg.netid = (uint32_t)message.network.getNetID();
neomsg.type = (uint8_t)type;
neomsg.length = message.data.size();