From 34604d5b1f6ae14c65b3992478b59f7108051979 Mon Sep 17 00:00:00 2001 From: Derek Mauro Date: Mon, 12 Feb 2024 09:43:50 -0800 Subject: [PATCH] Remove deprecated symbol absl::kuint128max absl::kuint128max should be replaced with absl::Uint128Max() PiperOrigin-RevId: 606279299 Change-Id: Ib67b5431f14891f56bb706e62f183d0de75d335f --- absl/numeric/int128.cc | 3 --- absl/numeric/int128.h | 5 ----- absl/numeric/int128_stream_test.cc | 6 +++--- absl/numeric/int128_test.cc | 2 -- absl/time/duration.cc | 2 +- 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/absl/numeric/int128.cc b/absl/numeric/int128.cc index daa32b51833..5d6c68d1281 100644 --- a/absl/numeric/int128.cc +++ b/absl/numeric/int128.cc @@ -29,9 +29,6 @@ namespace absl { ABSL_NAMESPACE_BEGIN -ABSL_DLL const uint128 kuint128max = MakeUint128( - std::numeric_limits::max(), std::numeric_limits::max()); - namespace { // Returns the 0-based position of the last set bit (i.e., most significant bit) diff --git a/absl/numeric/int128.h b/absl/numeric/int128.h index 7530a793410..a17d0e1b641 100644 --- a/absl/numeric/int128.h +++ b/absl/numeric/int128.h @@ -244,11 +244,6 @@ class #endif // byte order }; -// Prefer to use the constexpr `Uint128Max()`. -// -// TODO(absl-team) deprecate kuint128max once migration tool is released. -ABSL_DLL extern const uint128 kuint128max; - // allow uint128 to be logged std::ostream& operator<<(std::ostream& os, uint128 v); diff --git a/absl/numeric/int128_stream_test.cc b/absl/numeric/int128_stream_test.cc index bd937847d0a..1b058e17852 100644 --- a/absl/numeric/int128_stream_test.cc +++ b/absl/numeric/int128_stream_test.cc @@ -135,11 +135,11 @@ TEST(Uint128, OStreamValueTest) { "2000000000000000000000000000000000000000000"}); CheckUint128Case({absl::MakeUint128(0x8000000000000000, 0), kHex, /*width = */ 0, "80000000000000000000000000000000"}); - CheckUint128Case({absl::kuint128max, kDec, /*width = */ 0, + CheckUint128Case({absl::Uint128Max(), kDec, /*width = */ 0, "340282366920938463463374607431768211455"}); - CheckUint128Case({absl::kuint128max, kOct, /*width = */ 0, + CheckUint128Case({absl::Uint128Max(), kOct, /*width = */ 0, "3777777777777777777777777777777777777777777"}); - CheckUint128Case({absl::kuint128max, kHex, /*width = */ 0, + CheckUint128Case({absl::Uint128Max(), kHex, /*width = */ 0, "ffffffffffffffffffffffffffffffff"}); } diff --git a/absl/numeric/int128_test.cc b/absl/numeric/int128_test.cc index 005ff9a42ec..f17a5f6b294 100644 --- a/absl/numeric/int128_test.cc +++ b/absl/numeric/int128_test.cc @@ -231,8 +231,6 @@ TEST(Uint128, AllTests) { EXPECT_EQ(two, -((-one) - 1)); EXPECT_EQ(absl::Uint128Max(), -one); EXPECT_EQ(zero, -zero); - - EXPECT_EQ(absl::Uint128Max(), absl::kuint128max); } TEST(Int128, RightShiftOfNegativeNumbers) { diff --git a/absl/time/duration.cc b/absl/time/duration.cc index bdb16e21092..13b268c0b18 100644 --- a/absl/time/duration.cc +++ b/absl/time/duration.cc @@ -219,7 +219,7 @@ struct SafeMultiply { ? static_cast(Uint128Low64(a) * Uint128Low64(b)) : a * b; } - return b == 0 ? b : (a > kuint128max / b) ? kuint128max : a * b; + return b == 0 ? b : (a > Uint128Max() / b) ? Uint128Max() : a * b; } };