summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Abseil Team <absl-team@google.com>2023-09-13 07:07:57 -0700
committerGravatar Copybara-Service <copybara-worker@google.com>2023-09-13 07:09:00 -0700
commit6c6b2733f8453f53e4e07fe4e311d52d51aad100 (patch)
tree236c67efe28031a287b898d3b3798d8de99834f0
parentf5b19acb907305a942f455154b85563ba34990cb (diff)
Removed Google-only #ifdefs.
PiperOrigin-RevId: 565040001 Change-Id: I1c2e715c97375754c8d863132be2c388265ca4ad
-rw-r--r--absl/numeric/bits.h19
1 files changed, 8 insertions, 11 deletions
diff --git a/absl/numeric/bits.h b/absl/numeric/bits.h
index 4b90d3fa..c76454c8 100644
--- a/absl/numeric/bits.h
+++ b/absl/numeric/bits.h
@@ -54,11 +54,8 @@ ABSL_NAMESPACE_BEGIN
// libc++ had the wrong signature for std::rotl and std::rotr
// prior to libc++ 18.0.
//
-// b/289016048 requires a workaround for _LIBCPP_GOOGLE3.
-#if (defined(__cpp_lib_bitops) && __cpp_lib_bitops >= 201907L) && \
- (!defined(_LIBCPP_VERSION) || _LIBCPP_VERSION >= 180000) && \
- !defined(_LIBCPP_GOOGLE3)
-
+#if (defined(__cpp_lib_bitops) && __cpp_lib_bitops >= 201907L) && \
+ (!defined(_LIBCPP_VERSION) || _LIBCPP_VERSION >= 180000)
using std::rotl;
using std::rotr;
@@ -81,9 +78,11 @@ ABSL_MUST_USE_RESULT constexpr
#endif
-// b/289016048 requires a workaround for _LIBCPP_GOOGLE3.
-#if (defined(__cpp_lib_bitops) && __cpp_lib_bitops >= 201907L) && \
- !defined(_LIBCPP_GOOGLE3)
+// https://github.com/llvm/llvm-project/issues/64544
+// libc++ had the wrong signature for std::rotl and std::rotr
+// prior to libc++ 18.0.
+//
+#if (defined(__cpp_lib_bitops) && __cpp_lib_bitops >= 201907L)
using std::countl_one;
using std::countl_zero;
@@ -137,9 +136,7 @@ ABSL_INTERNAL_CONSTEXPR_POPCOUNT inline
#endif
-// b/289016048 requires a workaround for _LIBCPP_GOOGLE3.
-#if (defined(__cpp_lib_int_pow2) && __cpp_lib_int_pow2 >= 202002L) && \
- !defined(_LIBCPP_GOOGLE3)
+#if (defined(__cpp_lib_int_pow2) && __cpp_lib_int_pow2 >= 202002L)
using std::bit_ceil;
using std::bit_floor;