about summary refs log tree commit diff
path: root/absl/base
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2020-04-27T21·49-0700
committerGennadiy Rozental <rogeeff@google.com>2020-04-27T22·08-0400
commit6e18c7115df9b7ca0987cc346b1b1d4b3cc829b3 (patch)
tree95192d42166a4743b9d19f9a9d115c5984bdbb78 /absl/base
parent3f48ce1c48f8c51b669b66b1c05e9da28704420b (diff)
Export of internal Abseil changes
--
016342692a38a2ecb7e2e3bb658ad0e352cd5885 by Gennadiy Rozental <rogeeff@google.com>:

Minor documentation fix for base/attributes.h

Import of https://github.com/abseil/abseil-cpp/pull/673

PiperOrigin-RevId: 308703106

--
cf0abc14f9a8fb9ccf99a8ac7475d2100771ed89 by Greg Falcon <gfalcon@google.com>:

internal change

PiperOrigin-RevId: 308684014

--
ea6ffabf61d09cfc9b791c1144a155c6be45f086 by Gennadiy Rozental <rogeeff@google.com>:

Import of CCTZ from GitHub.

PiperOrigin-RevId: 308672487

--
2106b40ade57dd07039705a9f1198b06f535a8de by Abseil Team <absl-team@google.com>:

Replace deprecated thread annotations macro

PiperOrigin-RevId: 308604266
GitOrigin-RevId: 016342692a38a2ecb7e2e3bb658ad0e352cd5885
Change-Id: Ib9dd67ffd3a9807d55cad53472348e797b43cd24
Diffstat (limited to 'absl/base')
-rw-r--r--absl/base/internal/sysinfo.cc3
1 files changed, 2 insertions, 1 deletions
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<uint32_t>* tid_array GUARDED_BY(tid_lock) = nullptr;
+static std::vector<uint32_t>* tid_array ABSL_GUARDED_BY(tid_lock) = nullptr;
 static constexpr int kBitsPerWord = 32;  // tid_array is uint32_t.
 
 // Returns the TID to tid_array.