diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-08-22 17:27:52 +0300 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-08-25 02:03:19 +0300 |
commit | 3ef378731ad89de4dd77e0cb79860cc86676060e (patch) | |
tree | b70b6f5cd6347e2ac1cb87e4beb35084d3156355 | |
parent | f2734ff3ab09d3ab78321daf61d18cb628da2b98 (diff) |
libcamera: Drop explicit construction of std::queue
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 <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
-rw-r--r-- | src/libcamera/pipeline/ipu3/cio2.cpp | 4 | ||||
-rw-r--r-- | 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<FrameBuffer *>{}; - + 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<FrameBuffer *>{}; - data->embeddedQueue_ = std::queue<FrameBuffer *>{}; + data->bayerQueue_ = {}; + data->embeddedQueue_ = {}; /* Stop the IPA. */ data->ipa_->stop(); |