| Index: webrtc/base/criticalsection.cc
|
| diff --git a/webrtc/base/criticalsection.cc b/webrtc/base/criticalsection.cc
|
| index 97322f45c9368b64d7f4fae24ca3a5f56aaee260..1f50c2355dbcef57b016f31dcc8c68501b9a84ca 100644
|
| --- a/webrtc/base/criticalsection.cc
|
| +++ b/webrtc/base/criticalsection.cc
|
| @@ -139,7 +139,7 @@
|
| const struct timespec ts_null = {0};
|
| #endif
|
|
|
| - while (AtomicInt::CompareAndSwap(&lock_acquired, 0, 1)) {
|
| + while (AtomicOps::CompareAndSwap(&lock_acquired, 0, 1)) {
|
| #if defined(WEBRTC_WIN)
|
| ::Sleep(0);
|
| #else
|
| @@ -149,13 +149,16 @@
|
| }
|
|
|
| void GlobalLockPod::Unlock() {
|
| - int old_value = AtomicInt::CompareAndSwap(&lock_acquired, 1, 0);
|
| + int old_value = AtomicOps::CompareAndSwap(&lock_acquired, 1, 0);
|
| RTC_DCHECK_EQ(1, old_value) << "Unlock called without calling Lock first";
|
| }
|
|
|
| -GlobalLock::GlobalLock() : GlobalLockPod({{0}}) {}
|
| +GlobalLock::GlobalLock() {
|
| + lock_acquired = 0;
|
| +}
|
|
|
| -GlobalLockScope::GlobalLockScope(GlobalLockPod* lock) : lock_(lock) {
|
| +GlobalLockScope::GlobalLockScope(GlobalLockPod* lock)
|
| + : lock_(lock) {
|
| lock_->Lock();
|
| }
|
|
|
|
|