diff options
| author |  Benjamin Barenblat <bbaren@google.com> | 2022-10-18 08:10:07 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@google.com> | 2022-10-18 08:10:07 -0400 |
| commit | 6346937ba66bc0b5a2c2770ad017018a8b061475 (patch) | |
| tree | ca02f1265c306acfeea18c7e9b2dd92d71525897 | |
| parent | 564922c415f4576a4eb3ba2edd34c1cbf0c68de5 (diff) | |
| parent | 8c0b94e793a66495e0b1f34a5eb26bd7dc672db0 (diff) | |
Merge upstream LTS update 20220623.1
| -rw-r--r-- | absl/base/config.h | 2 | ||||
| -rw-r--r-- | absl/time/clock.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/absl/base/config.h b/absl/base/config.h index 8533aead..705ecea0 100644 --- a/absl/base/config.h +++ b/absl/base/config.h @@ -112,7 +112,7 @@ // LTS releases can be obtained from // https://github.com/abseil/abseil-cpp/releases. #define ABSL_LTS_RELEASE_VERSION 20220623 -#define ABSL_LTS_RELEASE_PATCH_LEVEL 0 +#define ABSL_LTS_RELEASE_PATCH_LEVEL 1 // Helper macro to convert a CPP variable to a string literal. #define ABSL_INTERNAL_DO_TOKEN_STR(x) #x diff --git a/absl/time/clock.cc b/absl/time/clock.cc index 7b204c4e..a091efdc 100644 --- a/absl/time/clock.cc +++ b/absl/time/clock.cc @@ -196,7 +196,7 @@ struct ABSL_CACHELINE_ALIGNED TimeState { absl::base_internal::SpinLock lock{absl::kConstInit, base_internal::SCHEDULE_KERNEL_ONLY}; }; -ABSL_CONST_INIT static TimeState time_state{}; +ABSL_CONST_INIT static TimeState time_state; // Return the time in ns as told by the kernel interface. Place in *cycleclock // the value of the cycleclock at about the time of the syscall. |