From 3ef378731ad89de4dd77e0cb79860cc86676060e Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 22 Aug 2020 17:27:52 +0300 Subject: libcamera: Drop explicit construction of std::queue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that libcamera is using C++17 and requires gcc 7 or newer, we can use the implicit std::queue constructor. Simplify the code accordingly. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham Reviewed-by: Niklas Söderlund --- src/libcamera/pipeline/ipu3/cio2.cpp | 4 +--- src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp index abe6d8a5..e43ec70f 100644 --- a/src/libcamera/pipeline/ipu3/cio2.cpp +++ b/src/libcamera/pipeline/ipu3/cio2.cpp @@ -300,9 +300,7 @@ void CIO2Device::tryReturnBuffer(FrameBuffer *buffer) void CIO2Device::freeBuffers() { - /* The default std::queue constructor is explicit with gcc 5 and 6. */ - availableBuffers_ = std::queue{}; - + availableBuffers_ = {}; buffers_.clear(); if (output_->releaseBuffers()) diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index eeaf335c..b8f0549f 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -848,9 +848,8 @@ void PipelineHandlerRPi::stop(Camera *camera) /* This also stops the streams. */ data->clearIncompleteRequests(); - /* The default std::queue constructor is explicit with gcc 5 and 6. */ - data->bayerQueue_ = std::queue{}; - data->embeddedQueue_ = std::queue{}; + data->bayerQueue_ = {}; + data->embeddedQueue_ = {}; /* Stop the IPA. */ data->ipa_->stop(); -- cgit v1.2.1