From 6e18c7115df9b7ca0987cc346b1b1d4b3cc829b3 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Mon, 27 Apr 2020 14:49:36 -0700 Subject: Export of internal Abseil changes -- 016342692a38a2ecb7e2e3bb658ad0e352cd5885 by Gennadiy Rozental : Minor documentation fix for base/attributes.h Import of https://github.com/abseil/abseil-cpp/pull/673 PiperOrigin-RevId: 308703106 -- cf0abc14f9a8fb9ccf99a8ac7475d2100771ed89 by Greg Falcon : internal change PiperOrigin-RevId: 308684014 -- ea6ffabf61d09cfc9b791c1144a155c6be45f086 by Gennadiy Rozental : Import of CCTZ from GitHub. PiperOrigin-RevId: 308672487 -- 2106b40ade57dd07039705a9f1198b06f535a8de by Abseil Team : Replace deprecated thread annotations macro PiperOrigin-RevId: 308604266 GitOrigin-RevId: 016342692a38a2ecb7e2e3bb658ad0e352cd5885 Change-Id: Ib9dd67ffd3a9807d55cad53472348e797b43cd24 --- absl/base/internal/sysinfo.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'absl/base') diff --git a/absl/base/internal/sysinfo.cc b/absl/base/internal/sysinfo.cc index 72f9f1738ab8..c3f275ca8a28 100644 --- a/absl/base/internal/sysinfo.cc +++ b/absl/base/internal/sysinfo.cc @@ -53,6 +53,7 @@ #include "absl/base/internal/raw_logging.h" #include "absl/base/internal/spinlock.h" #include "absl/base/internal/unscaledcycleclock.h" +#include "absl/base/thread_annotations.h" namespace absl { ABSL_NAMESPACE_BEGIN @@ -351,7 +352,7 @@ static absl::base_internal::SpinLock tid_lock( // We set a bit per thread in this array to indicate that an ID is in // use. ID 0 is unused because it is the default value returned by // pthread_getspecific(). -static std::vector* tid_array GUARDED_BY(tid_lock) = nullptr; +static std::vector* tid_array ABSL_GUARDED_BY(tid_lock) = nullptr; static constexpr int kBitsPerWord = 32; // tid_array is uint32_t. // Returns the TID to tid_array. -- cgit 1.4.1