From f6acf98a46ec62ee97a51a1549933c0783ea4355 Mon Sep 17 00:00:00 2001 From: "andresp@webrtc.org" Date: Fri, 20 Dec 2013 21:54:26 +0000 Subject: [PATCH] Fix the android clang bot for compiling with thread annotations. TBR=niklas.enbom@webrtc.org R=niklas.enbom@webrtc.org Review URL: https://webrtc-codereview.appspot.com/6279005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5330 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/audio_device/android/audio_record_jni.h | 9 ++++----- webrtc/modules/audio_device/android/audio_track_jni.h | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/webrtc/modules/audio_device/android/audio_record_jni.h b/webrtc/modules/audio_device/android/audio_record_jni.h index f96f55a4c..1c525ff56 100644 --- a/webrtc/modules/audio_device/android/audio_record_jni.h +++ b/webrtc/modules/audio_device/android/audio_record_jni.h @@ -110,13 +110,12 @@ class AudioRecordJni { int32_t SetRecordingSampleRate(const uint32_t samplesPerSec); private: - // Lock - void Lock() { + void Lock() EXCLUSIVE_LOCK_FUNCTION(_critSect) { _critSect.Enter(); - }; - void UnLock() { + } + void UnLock() UNLOCK_FUNCTION(_critSect) { _critSect.Leave(); - }; + } int32_t InitJavaResources(); int32_t InitSampleRate(); diff --git a/webrtc/modules/audio_device/android/audio_track_jni.h b/webrtc/modules/audio_device/android/audio_track_jni.h index 180bcecfb..1c1721025 100644 --- a/webrtc/modules/audio_device/android/audio_track_jni.h +++ b/webrtc/modules/audio_device/android/audio_track_jni.h @@ -111,13 +111,12 @@ class AudioTrackJni : public PlayoutDelayProvider { virtual int PlayoutDelayMs() { return 0; } private: - // Lock - void Lock() { + void Lock() EXCLUSIVE_LOCK_FUNCTION(_critSect) { _critSect.Enter(); - }; - void UnLock() { + } + void UnLock() UNLOCK_FUNCTION(_critSect) { _critSect.Leave(); - }; + } int32_t InitJavaResources(); int32_t InitSampleRate();