diff options
author | Benjamin Barenblat <bbaren@google.com> | 2021-06-01 15:17:05 -0400 |
---|---|---|
committer | Benjamin Barenblat <bbaren@google.com> | 2021-06-01 15:17:05 -0400 |
commit | 69d6d103ecf71e1a57f99077664d37ff54bf883e (patch) | |
tree | a8e1dbe1e1efd6445e6fcf64973e8f5cd51ef30a /absl/base/internal/thread_identity.cc | |
parent | ebc3d7213cf73b26b5e44edff58c759ea44ee9aa (diff) | |
parent | 278e0a071885a22dcd2fd1b5576cc44757299343 (diff) |
Merge upstream LTS update 20210324.2
Diffstat (limited to 'absl/base/internal/thread_identity.cc')
-rw-r--r-- | absl/base/internal/thread_identity.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/absl/base/internal/thread_identity.cc b/absl/base/internal/thread_identity.cc index 6ea010ed..9950e63a 100644 --- a/absl/base/internal/thread_identity.cc +++ b/absl/base/internal/thread_identity.cc @@ -120,10 +120,10 @@ void SetCurrentThreadIdentity( ABSL_THREAD_IDENTITY_MODE == ABSL_THREAD_IDENTITY_MODE_USE_CPP11 // Please see the comment on `CurrentThreadIdentityIfPresent` in -// thread_identity.h. Because DLLs cannot expose thread_local variables in -// headers, we opt for the correct-but-slower option of placing the definition -// of this function only in a translation unit inside DLL. -#if defined(ABSL_BUILD_DLL) || defined(ABSL_CONSUME_DLL) +// thread_identity.h. When we cannot expose thread_local variables in +// headers, we opt for the correct-but-slower option of not inlining this +// function. +#ifndef ABSL_INTERNAL_INLINE_CURRENT_THREAD_IDENTITY_IF_PRESENT ThreadIdentity* CurrentThreadIdentityIfPresent() { return thread_identity_ptr; } #endif #endif |