Browse Source

Fix C++ 20 compiler warning

QGC4.4
DonLakeFlyer 5 years ago
parent
commit
4d4c0b6314
  1. 1
      src/Vehicle/Vehicle.cc
  2. 12
      src/Vehicle/Vehicle.h

1
src/Vehicle/Vehicle.cc

@ -3389,6 +3389,7 @@ void Vehicle::requestMessage(RequestMessageResultHandler resultHandler, void* re @@ -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;

12
src/Vehicle/Vehicle.h

@ -1582,12 +1582,12 @@ private: @@ -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);

Loading…
Cancel
Save