about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2020-01-30T15·43-0800
committerGennadiy Rozental <rogeeff@google.com>2020-01-30T21·03-0500
commitc512f118dde6ffd51cb7d8ac8804bbaf4d266c3a (patch)
treec0c50eeae6c275797b7229ecedaad8e85a40a675
parent37dd2562ec830d547a1524bb306be313ac3f2556 (diff)
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
-rw-r--r--absl/time/clock.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/absl/time/clock.cc b/absl/time/clock.cc
index 9e9a0386e52b..3b895c38e968 100644
--- a/absl/time/clock.cc
+++ b/absl/time/clock.cc
@@ -390,7 +390,7 @@ static uint64_t UpdateLastSample(
 // 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 int64_t GetCurrentTimeNanosSlowPath() LOCKS_EXCLUDED(lock) {
 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