From f6eea9486ae1935017f42d1f89005ddafb0bd53a Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Thu, 25 Jan 2018 10:52:02 -0800 Subject: Changes imported from Abseil "staging" branch: - a74a7e9027e3f90835ae0f553f98be294781da18 Internal change by Abseil Team - 2d32db6ed063f93b67886b9c27602d5aea3c21f7 Add /D_SCL_SECURE_NO_WARNINGS to MSVC builds to disable c... by Jon Cohen - 54f40318d1de67b6b25f8aa68343f8bbcde8c304 Use sized delete in FixedArray. by Chris Kennelly - 193f50b3500ab1a102a00df4e05ad7b969e9337b Fixes some warnings that show up during builds with msvc. by Greg Miller GitOrigin-RevId: a74a7e9027e3f90835ae0f553f98be294781da18 Change-Id: I6d2b1f496974a1399ca5db6b71274368c2699a59 --- absl/base/internal/spinlock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'absl/base/internal/spinlock.h') diff --git a/absl/base/internal/spinlock.h b/absl/base/internal/spinlock.h index a9037e3e..212abc66 100644 --- a/absl/base/internal/spinlock.h +++ b/absl/base/internal/spinlock.h @@ -227,7 +227,7 @@ inline uint32_t SpinLock::TryLockInternal(uint32_t lock_value, kSpinLockHeld | lock_value | wait_cycles | sched_disabled_bit, std::memory_order_acquire, std::memory_order_relaxed)) { } else { - base_internal::SchedulingGuard::EnableRescheduling(sched_disabled_bit); + base_internal::SchedulingGuard::EnableRescheduling(sched_disabled_bit != 0); } return lock_value; -- cgit v1.2.3