From 06012cbc56c434438b861410c8c1c2558b8ba229 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 3 Jun 2020 14:54:50 +1000 Subject: [PATCH] GCS_MAVLink: cope with RingBuffer rename if empty() to is_empty() --- libraries/GCS_MAVLink/GCS_Common.cpp | 2 +- libraries/GCS_MAVLink/GCS_FTP.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/GCS_MAVLink/GCS_Common.cpp b/libraries/GCS_MAVLink/GCS_Common.cpp index cf808722cc..6869730c90 100644 --- a/libraries/GCS_MAVLink/GCS_Common.cpp +++ b/libraries/GCS_MAVLink/GCS_Common.cpp @@ -1899,7 +1899,7 @@ void GCS::service_statustext(void) // is if you have a super slow link mixed with a faster port, if there are _status_capacity // strings in the slow queue then the next item can not be queued for the faster link - if (_statustext_queue.empty()) { + if (_statustext_queue.is_empty()) { // nothing to do return; } diff --git a/libraries/GCS_MAVLink/GCS_FTP.cpp b/libraries/GCS_MAVLink/GCS_FTP.cpp index 1e1d667d1d..aa8929ad6e 100644 --- a/libraries/GCS_MAVLink/GCS_FTP.cpp +++ b/libraries/GCS_MAVLink/GCS_FTP.cpp @@ -95,7 +95,7 @@ void GCS_MAVLINK::send_ftp_replies(void) send_banner(); } - if (ftp.replies == nullptr || ftp.replies->empty()) { + if (ftp.replies == nullptr || ftp.replies->is_empty()) { return; }