Merge "OpenSLES: Fix deprecated volatile op warning" into main am: e7a596c480
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>
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 @@
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)
