From b1559227b0bc46408752de52ca0644d1f89d2671 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Wed, 23 Feb 2022 10:37:09 -0800 Subject: Make some structs nested --- common/ringbuffer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'common/ringbuffer.cpp') diff --git a/common/ringbuffer.cpp b/common/ringbuffer.cpp index 91857499..0aec1d49 100644 --- a/common/ringbuffer.cpp +++ b/common/ringbuffer.cpp @@ -160,9 +160,9 @@ size_t RingBuffer::write(const void *src, size_t cnt) noexcept } -ll_ringbuffer_data_pair RingBuffer::getReadVector() const noexcept +auto RingBuffer::getReadVector() const noexcept -> DataPair { - ll_ringbuffer_data_pair ret; + DataPair ret; size_t w{mWritePtr.load(std::memory_order_acquire)}; size_t r{mReadPtr.load(std::memory_order_acquire)}; @@ -192,9 +192,9 @@ ll_ringbuffer_data_pair RingBuffer::getReadVector() const noexcept return ret; } -ll_ringbuffer_data_pair RingBuffer::getWriteVector() const noexcept +auto RingBuffer::getWriteVector() const noexcept -> DataPair { - ll_ringbuffer_data_pair ret; + DataPair ret; size_t w{mWritePtr.load(std::memory_order_acquire)}; size_t r{mReadPtr.load(std::memory_order_acquire) + mWriteSize - mSizeMask}; -- cgit v1.2.3