From 5b5fdf5e31c58c023bed8fb446e0281036898bb2 Mon Sep 17 00:00:00 2001 From: Morton Lin Date: Mon, 2 Nov 2020 23:38:32 +0800 Subject: [PATCH] fix warning C5208 on windows(stop the build process) (#9145) (cherry picked from commit e049bc1c3c4b63eb7e7a47df4c9d187b36ef8992) --- src/Vehicle/Vehicle.h | 4 ++-- src/Vehicle/VehicleLinkManager.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h index 71e785363..8bc97dee0 100644 --- a/src/Vehicle/Vehicle.h +++ b/src/Vehicle/Vehicle.h @@ -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: 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; diff --git a/src/Vehicle/VehicleLinkManager.h b/src/Vehicle/VehicleLinkManager.h index eda8b2899..8bba75af9 100644 --- a/src/Vehicle/VehicleLinkManager.h +++ b/src/Vehicle/VehicleLinkManager.h @@ -77,7 +77,7 @@ private: LinkInterface* _bestActivePrimaryLink (void); void _commRegainedOnLink (LinkInterface* link); - typedef struct { + typedef struct LinkInfo { SharedLinkInterfacePtr link; bool commLost = false; QElapsedTimer heartbeatElapsedTimer; -- 2.22.0