summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Prichard <rprichard@google.com>2023-07-25 22:13:29 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-07-25 22:13:29 +0000
commitea664191bd5be5979c2c29996fe859330c90dc51 (patch)
tree28782fcd194e8fd7fd54ee506804aef845c16e47
parente094bef721948e46bda92d041fd5e9f4d6dbeafb (diff)
parent25d1840a1e414e10ec0691e4573c50c160b45799 (diff)
downloadincremental_delivery-ea664191bd5be5979c2c29996fe859330c90dc51.tar.gz
Accommodate [[nodiscard]] std::lock_guard in updated libc++ am: 164ecc7727 am: 25d1840a1e
Original change: https://android-review.googlesource.com/c/platform/system/incremental_delivery/+/2674657 Change-Id: I017603d73263709f95985c578987ffa8a5a5557b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--libdataloader/DataLoaderConnector.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libdataloader/DataLoaderConnector.cpp b/libdataloader/DataLoaderConnector.cpp
index f5f82ea..0206cf1 100644
--- a/libdataloader/DataLoaderConnector.cpp
+++ b/libdataloader/DataLoaderConnector.cpp
@@ -401,8 +401,8 @@ public:
// Stopping both loopers and waiting for them to exit - we should be able to acquire/release
// both mutexes.
mRunning = false;
- std::lock_guard{mPendingReadsLooperBusy}; // NOLINT
- std::lock_guard{mLogLooperBusy}; // NOLINT
+ (void)std::lock_guard{mPendingReadsLooperBusy}; // NOLINT
+ (void)std::lock_guard{mLogLooperBusy}; // NOLINT
if (mDataLoader->onStop) {
mDataLoader->onStop(mDataLoader);