From 1d528d552fcbede799acaaf80c55afdcf5b8d13c Mon Sep 17 00:00:00 2001 From: Tom Pittenger Date: Sun, 21 Feb 2016 22:13:27 -0800 Subject: [PATCH] AP_HAL: rename RingBuffer.force() to RingBuffer.push_force() --- libraries/AP_HAL/utility/RingBuffer.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/AP_HAL/utility/RingBuffer.h b/libraries/AP_HAL/utility/RingBuffer.h index 0d15ef914e..0fe454688f 100644 --- a/libraries/AP_HAL/utility/RingBuffer.h +++ b/libraries/AP_HAL/utility/RingBuffer.h @@ -130,10 +130,10 @@ public: /* - force() is semantically equivalent to: - if (!push(t)) { pop(); push(t); } + * push_force() is semantically equivalent to: + * if (!push(t)) { pop(); push(t); } */ - bool force(const T &object) { + bool push_force(const T &object) { if (buffer->space() < sizeof(T)) { buffer->advance(sizeof(T)); }