A few more occurences of std::bit_width

Author: jonkeane

cpp/src/arrow/util/rle_encoding_test.cc

@@ -916,7 +916,13 @@ TEST(BitRle, Random) {
       }
       parity = !parity;
     }
+    // TODO: We can remove this condition once CRAN upgrades its macOS
+    // SDK from 11.3.
+#if defined(__clang__) && !defined(__cpp_lib_bitops)
+    if (!CheckRoundTrip(values, std::log2p1(values.size()))) {
+#else
     if (!CheckRoundTrip(values, std::bit_width(values.size()))) {
+#endif
       FAIL() << "failing seed: " << seed;
     }
   }

cpp/src/parquet/chunker_internal.cc

@@ -86,7 +86,13 @@ uint64_t CalculateMask(int64_t min_chunk_size, int64_t max_chunk_size, int norm_
 
   // assuming that the gear hash has a uniform distribution, we can calculate the mask
   // by taking the floor(log2(target_size))
+  // TODO: We can remove this condition once CRAN upgrades its macOS
+  // SDK from 11.3.
+#if defined(__clang__) && !defined(__cpp_lib_bitops)
+  auto target_bits = std::log2p1(static_cast<uint64_t>(target_size));
+#else
   auto target_bits = std::bit_width(static_cast<uint64_t>(target_size));
+#endif
   int mask_bits = target_bits == 0 ? 0 : static_cast<int>(target_bits - 1);
 
   // a user defined `norm_level` can be used to adjust the mask size, hence the matching

cpp/src/parquet/encoder.cc

@@ -1167,8 +1167,15 @@ void DeltaBitPackEncoder<DType>::FlushBlock() {
 
     // The minimum number of bits required to write any of values in deltas_ vector.
     // See overflow comment above.
+    // TODO: We can remove this condition once CRAN upgrades its macOS
+    // SDK from 11.3.
+#if defined(__clang__) && !defined(__cpp_lib_bitops)
+    const auto bit_width = bit_width_data[i] =
+        std::log2p1(static_cast<UT>(max_delta) - static_cast<UT>(min_delta));
+#else
     const auto bit_width = bit_width_data[i] =
         std::bit_width(static_cast<UT>(max_delta) - static_cast<UT>(min_delta));
+#endif
 
     for (uint32_t j = start; j < start + values_current_mini_block; j++) {
       // Convert delta to frame of reference. See overflow comment above.