From ba3a1cb5292580ca19e9b3849e3608353a5fa98b Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Thu, 5 Mar 2020 15:30:00 -0800 Subject: [PATCH] Fix bugprone-use-after-move warnings Bug: 150783499 Test: WITH_TIDY=1 make Change-Id: If257532523674ea6256b72ec765904a8de5bf565 --- camera/device/3.2/default/CameraDeviceSession.cpp | 3 ++- camera/device/3.4/default/CameraDeviceSession.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/camera/device/3.2/default/CameraDeviceSession.cpp b/camera/device/3.2/default/CameraDeviceSession.cpp index 99cdccbcdb..769991c5fa 100644 --- a/camera/device/3.2/default/CameraDeviceSession.cpp +++ b/camera/device/3.2/default/CameraDeviceSession.cpp @@ -790,8 +790,9 @@ void CameraDeviceSession::ResultBatcher::processCaptureResult(CaptureResult& res auto it = batch->mBatchBufs.find(buffer.streamId); if (it != batch->mBatchBufs.end()) { InflightBatch::BufferBatch& bb = it->second; + auto id = buffer.streamId; pushStreamBuffer(std::move(buffer), bb.mBuffers); - filledStreams.push_back(buffer.streamId); + filledStreams.push_back(id); } else { pushStreamBuffer(std::move(buffer), nonBatchedBuffers); } diff --git a/camera/device/3.4/default/CameraDeviceSession.cpp b/camera/device/3.4/default/CameraDeviceSession.cpp index b4ebe22701..3f088a3d94 100644 --- a/camera/device/3.4/default/CameraDeviceSession.cpp +++ b/camera/device/3.4/default/CameraDeviceSession.cpp @@ -656,8 +656,9 @@ void CameraDeviceSession::ResultBatcher_3_4::processCaptureResult_3_4(CaptureRes auto it = batch->mBatchBufs.find(buffer.streamId); if (it != batch->mBatchBufs.end()) { InflightBatch::BufferBatch& bb = it->second; + auto id = buffer.streamId; pushStreamBuffer(std::move(buffer), bb.mBuffers); - filledStreams.push_back(buffer.streamId); + filledStreams.push_back(id); } else { pushStreamBuffer(std::move(buffer), nonBatchedBuffers); }