Skip to content

Commit ba7a9e2

Browse files
derekmaurocopybara-github
authored andcommitted
Remove the legacy thread annotation spellings
The legacy thread annotations were spellings that were not prefixed with ABSL_ and caused conflicts with other libraries. These spellings have been removed by default for a while, but could have been added back with the temporary compile flag -DABSL_LEGACY_THREAD_ANNOTATIONS. This change completely removes the legacy spellings. If you were relying on the legacy spellings, the fix is straightforward. Simply add the ABSL_ prefix. For example, GUARDED_BY() becomes ABSL_GUARDED_BY(). PiperOrigin-RevId: 560874026 Change-Id: Id072e67435472220ea4f43ccbf267028c13feba7
1 parent 1d83ac7 commit ba7a9e2

File tree

5 files changed

+0
-285
lines changed

5 files changed

+0
-285
lines changed

CMake/AbseilDll.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ set(ABSL_INTERNAL_DLL_FILES
4444
"base/internal/spinlock_wait.h"
4545
"base/internal/sysinfo.cc"
4646
"base/internal/sysinfo.h"
47-
"base/internal/thread_annotations.h"
4847
"base/internal/thread_identity.cc"
4948
"base/internal/thread_identity.h"
5049
"base/internal/throw_delegate.cc"

absl/base/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ cc_library(
161161
cc_library(
162162
name = "core_headers",
163163
srcs = [
164-
"internal/thread_annotations.h",
165164
],
166165
hdrs = [
167166
"attributes.h",

absl/base/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ absl_cc_library(
156156
"optimization.h"
157157
"port.h"
158158
"thread_annotations.h"
159-
"internal/thread_annotations.h"
160159
COPTS
161160
${ABSL_DEFAULT_COPTS}
162161
DEPS

absl/base/internal/thread_annotations.h

Lines changed: 0 additions & 280 deletions
This file was deleted.

absl/base/thread_annotations.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636

3737
#include "absl/base/attributes.h"
3838
#include "absl/base/config.h"
39-
// TODO(mbonadei): Remove after the backward compatibility period.
40-
#include "absl/base/internal/thread_annotations.h" // IWYU pragma: export
4139

4240
// ABSL_GUARDED_BY()
4341
//

0 commit comments

Comments
 (0)