about summary refs log tree commit diff
path: root/absl/base
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2018-02-21T16·32-0800
committerDerek Mauro <dmauro@google.com>2018-02-22T15·15-0500
commitdca2eb50f9f5ee378395ee020953dc20a2a84c97 (patch)
tree31c1476614cb761bc3f9547d3a3d0d37cf948cca /absl/base
parent03c1513538584f4a04d666be5eb469e3979febba (diff)
Changes imported from Abseil "staging" branch:
  - db061dd2b795837e6154be0991077ca5a03ec471 Release the async-signal safe demangler as an internal im... by Derek Mauro <dmauro@google.com>
  - 310440eb33d946df79d26bf1edf795f6a0b466b9 Use static_cast to constrain nanoseconds to int range, av... by Abseil Team <absl-team@google.com>

GitOrigin-RevId: db061dd2b795837e6154be0991077ca5a03ec471
Change-Id: Ibc1bc1db355a48115451da5ce88d66a1f6e1a182
Diffstat (limited to 'absl/base')
-rw-r--r--absl/base/internal/spinlock_wait.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/absl/base/internal/spinlock_wait.cc b/absl/base/internal/spinlock_wait.cc
index 8f951b66dc36..9f6e9911e109 100644
--- a/absl/base/internal/spinlock_wait.cc
+++ b/absl/base/internal/spinlock_wait.cc
@@ -72,7 +72,7 @@ int SpinLockSuggestedDelayNS(int loop) {
   // Mean is exponential in loop for first 32 iterations, then 8ms.
   // The futex path multiplies this by 16, since we expect explicit wakeups
   // almost always on that path.
-  return r >> (44 - (loop >> 3));
+  return static_cast<int>(r >> (44 - (loop >> 3)));
 }
 
 }  // namespace base_internal