Export of internal Abseil changes
--
98d2a423948c57be2d9c1c3a3f88413ad7ec80d6 by Abseil Team <absl-team@google.com>:
Replace deprecated thread annotations macros.
PiperOrigin-RevId: 292345809
GitOrigin-RevId: 98d2a423948c57be2d9c1c3a3f88413ad7ec80d6
Change-Id: I074c45a1ee725463467548ab6e7dc4cda7b7426c
diff --git a/absl/time/clock.cc b/absl/time/clock.cc
index 9e9a038..3b895c3 100644
--- a/absl/time/clock.cc
+++ b/absl/time/clock.cc
@@ -390,7 +390,7 @@
// TODO(absl-team): Remove this attribute when our compiler is smart enough
// to do the right thing.
ABSL_ATTRIBUTE_NOINLINE
-static int64_t GetCurrentTimeNanosSlowPath() LOCKS_EXCLUDED(lock) {
+static int64_t GetCurrentTimeNanosSlowPath() ABSL_LOCKS_EXCLUDED(lock) {
// Serialize access to slow-path. Fast-path readers are not blocked yet, and
// code below must not modify last_sample until the seqlock is acquired.
lock.Lock();
@@ -435,7 +435,7 @@
static uint64_t UpdateLastSample(uint64_t now_cycles, uint64_t now_ns,
uint64_t delta_cycles,
const struct TimeSample *sample)
- EXCLUSIVE_LOCKS_REQUIRED(lock) {
+ ABSL_EXCLUSIVE_LOCKS_REQUIRED(lock) {
uint64_t estimated_base_ns = now_ns;
uint64_t lock_value = SeqAcquire(&seq); // acquire seqlock to block readers
