diff options
| author | Elliott Hughes <enh@google.com> | 2024-01-24 00:46:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-24 00:46:59 +0000 |
| commit | b147666cd91023de87e219b043e3bc95c0d628fb (patch) | |
| tree | 831f95b0a7211905708cc293b55420366f3651b6 | |
| parent | 2901b2c41e0c27001f366c38a3c0897cf3eddfaf (diff) | |
| parent | f1d04bff5624f238c22d13e88c81295c5603969b (diff) | |
| download | libmemunreachable-main.tar.gz | |
Original change: https://android-review.googlesource.com/c/platform/system/memory/libmemunreachable/+/2924897
Change-Id: Ifda1b4a29cf16e86a3331c7482fcde83ed1ffc46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | ScopedSignalHandler.h | 2 | ||||
| -rw-r--r-- | tests/MemUnreachable_test.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ScopedSignalHandler.h b/ScopedSignalHandler.h index ef4473f..8cae4b6 100644 --- a/ScopedSignalHandler.h +++ b/ScopedSignalHandler.h @@ -50,7 +50,7 @@ class ScopedSignalHandler { } (*handler_map_)[signal] = - SignalFn([=](int signal, siginfo_t* si, void* uctx) { f(*this, signal, si, uctx); }); + SignalFn([=, this](int signal, siginfo_t* si, void* uctx) { f(*this, signal, si, uctx); }); struct sigaction act {}; act.sa_sigaction = [](int signal, siginfo_t* si, void* uctx) { diff --git a/tests/MemUnreachable_test.cpp b/tests/MemUnreachable_test.cpp index 8bc176b..4e2116b 100644 --- a/tests/MemUnreachable_test.cpp +++ b/tests/MemUnreachable_test.cpp @@ -49,7 +49,7 @@ class HiddenPointer { // Trick the compiler into thinking a value on the stack is still referenced. static void Ref(void** ptr) { - void** volatile storage; + void** volatile storage [[maybe_unused]]; storage = ptr; } |