commit | f5a31a2573874a3f0f44c767f55df3ef5b81a11c | [log] [tgz] |
---|---|---|
author | Ryan Prichard <rprichard@google.com> | Wed Jul 26 00:58:39 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 26 00:58:39 2023 +0000 |
tree | 3c54c6358c3a658d66b794e693cd6fa190539c88 | |
parent | ce98ee1bf86a3f03ccccad956a815bc606436195 [diff] | |
parent | 36c4dfe35a968971394c7fca13fac82a51ee4887 [diff] |
Accommodate [[nodiscard]] std::lock_guard in updated libc++ am: 164ecc7727 am: 25d1840a1e am: ea664191bd am: d7d78b1188 am: 36c4dfe35a Original change: https://android-review.googlesource.com/c/platform/system/incremental_delivery/+/2674657 Change-Id: I48ad96b2e26a66f18bbad10618211816dece1aca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 @@ // 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);