Browse Source

fix warning C5208 on windows(stop the build process) (#9145)

(cherry picked from commit e049bc1c3c4b63eb7e7a47df4c9d187b36ef8992)
QGC4.4
Morton Lin 5 years ago committed by GitHub
parent
commit
5b5fdf5e31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      src/Vehicle/Vehicle.h
  2. 2
      src/Vehicle/VehicleLinkManager.h

4
src/Vehicle/Vehicle.h

@ -1133,7 +1133,7 @@ private: @@ -1133,7 +1133,7 @@ private:
void _waitForMavlinkMessageMessageReceived(const mavlink_message_t& message);
// requestMessage handling
typedef struct {
typedef struct RequestMessageInfo {
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;
@ -1145,7 +1145,7 @@ private: @@ -1145,7 +1145,7 @@ private:
static void _requestMessageCmdResultHandler (void* resultHandlerData, int compId, MAV_RESULT result, MavCmdResultFailureCode_t failureCode);
static void _requestMessageWaitForMessageResultHandler (void* resultHandlerData, bool noResponsefromVehicle, const mavlink_message_t& message);
typedef struct {
typedef struct MavCommandListEntry {
int targetCompId = MAV_COMP_ID_AUTOPILOT1;
bool useCommandInt = false;
MAV_CMD command;

2
src/Vehicle/VehicleLinkManager.h

@ -77,7 +77,7 @@ private: @@ -77,7 +77,7 @@ private:
LinkInterface* _bestActivePrimaryLink (void);
void _commRegainedOnLink (LinkInterface* link);
typedef struct {
typedef struct LinkInfo {
SharedLinkInterfacePtr link;
bool commLost = false;
QElapsedTimer heartbeatElapsedTimer;

Loading…
Cancel
Save