From 4d4c0b63147767ca241a0bee987ad74a9df9c35b Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Thu, 6 Aug 2020 10:18:58 -0700 Subject: [PATCH] Fix C++ 20 compiler warning --- src/Vehicle/Vehicle.cc | 1 + src/Vehicle/Vehicle.h | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc index ef56be6e0..9062607de 100644 --- a/src/Vehicle/Vehicle.cc +++ b/src/Vehicle/Vehicle.cc @@ -3389,6 +3389,7 @@ void Vehicle::requestMessage(RequestMessageResultHandler resultHandler, void* re { RequestMessageInfo_t* pInfo = new RequestMessageInfo_t; + *pInfo = { }; pInfo->msgId = messageId; pInfo->compId = compId; pInfo->resultHandler = resultHandler; diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h index 7ebaafdde..6ca5b53be 100644 --- a/src/Vehicle/Vehicle.h +++ b/src/Vehicle/Vehicle.h @@ -1582,12 +1582,12 @@ private: // requestMessage handling typedef struct { - bool commandAckReceived = false; // We keep track of the ack/message being received since the order in which this will come in is random - bool messageReceived = false; // We only delete the allocated RequestMessageInfo_t when both happen (or the message wait times out) - int msgId = 0; - int compId = 0; - RequestMessageResultHandler resultHandler = nullptr; - void* resultHandlerData = nullptr; + bool commandAckReceived; // We keep track of the ack/message being received since the order in which this will come in is random + bool messageReceived; // We only delete the allocated RequestMessageInfo_t when both happen (or the message wait times out) + int msgId; + int compId; + RequestMessageResultHandler resultHandler; + void* resultHandlerData; } RequestMessageInfo_t; static void _requestMessageCmdResultHandler (void* resultHandlerData, int compId, MAV_RESULT result, bool noResponsefromVehicle); -- 2.22.0