diff options
| author | Andy Hung <hunga@google.com> | 2024-02-16 00:18:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-16 00:18:01 +0000 |
| commit | 4e0d2475a5cdd6d5d3fb8f95a01055098383f18a (patch) | |
| tree | f61341b1edb9d78059fdfe22670aa0808f3f5bea | |
| parent | 1319069e0af5ba687f1d3568876a531692f22b65 (diff) | |
| parent | e7a596c48050364d2160dbeddc9a9eddde2bd15c (diff) | |
| download | wilhelm-master.tar.gz | |
Original change: https://android-review.googlesource.com/c/platform/frameworks/wilhelm/+/2965727
Change-Id: Ie51945d09d34021574e803b254058edfdeb90f00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/locks.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/locks.cpp b/src/locks.cpp index 44128eb..f3edd33 100644 --- a/src/locks.cpp +++ b/src/locks.cpp @@ -117,7 +117,8 @@ forward_progress: thiz->mFile = file; thiz->mLine = line; // not android_atomic_inc because we are already holding a mutex - ++thiz->mGeneration; + // use explicit add as mGeneration is a volatile for which ++v and v += are deprecated. + thiz->mGeneration = thiz->mGeneration + 1; } #else void object_lock_exclusive(IObject *thiz) |