Commit 6c6b2733 by Abseil Team Committed by Copybara-Service

Removed Google-only #ifdefs.

PiperOrigin-RevId: 565040001
Change-Id: I1c2e715c97375754c8d863132be2c388265ca4ad
parent f5b19acb
...@@ -54,11 +54,8 @@ ABSL_NAMESPACE_BEGIN ...@@ -54,11 +54,8 @@ ABSL_NAMESPACE_BEGIN
// libc++ had the wrong signature for std::rotl and std::rotr // libc++ had the wrong signature for std::rotl and std::rotr
// prior to libc++ 18.0. // prior to libc++ 18.0.
// //
// b/289016048 requires a workaround for _LIBCPP_GOOGLE3.
#if (defined(__cpp_lib_bitops) && __cpp_lib_bitops >= 201907L) && \ #if (defined(__cpp_lib_bitops) && __cpp_lib_bitops >= 201907L) && \
(!defined(_LIBCPP_VERSION) || _LIBCPP_VERSION >= 180000) && \ (!defined(_LIBCPP_VERSION) || _LIBCPP_VERSION >= 180000)
!defined(_LIBCPP_GOOGLE3)
using std::rotl; using std::rotl;
using std::rotr; using std::rotr;
...@@ -81,9 +78,11 @@ ABSL_MUST_USE_RESULT constexpr ...@@ -81,9 +78,11 @@ ABSL_MUST_USE_RESULT constexpr
#endif #endif
// b/289016048 requires a workaround for _LIBCPP_GOOGLE3. // https://github.com/llvm/llvm-project/issues/64544
#if (defined(__cpp_lib_bitops) && __cpp_lib_bitops >= 201907L) && \ // libc++ had the wrong signature for std::rotl and std::rotr
!defined(_LIBCPP_GOOGLE3) // prior to libc++ 18.0.
//
#if (defined(__cpp_lib_bitops) && __cpp_lib_bitops >= 201907L)
using std::countl_one; using std::countl_one;
using std::countl_zero; using std::countl_zero;
...@@ -137,9 +136,7 @@ ABSL_INTERNAL_CONSTEXPR_POPCOUNT inline ...@@ -137,9 +136,7 @@ ABSL_INTERNAL_CONSTEXPR_POPCOUNT inline
#endif #endif
// b/289016048 requires a workaround for _LIBCPP_GOOGLE3. #if (defined(__cpp_lib_int_pow2) && __cpp_lib_int_pow2 >= 202002L)
#if (defined(__cpp_lib_int_pow2) && __cpp_lib_int_pow2 >= 202002L) && \
!defined(_LIBCPP_GOOGLE3)
using std::bit_ceil; using std::bit_ceil;
using std::bit_floor; using std::bit_floor;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment