Skip to content

Commit dd1d942

Browse files
committed
Avoid namespace conflict
1 parent bbfc25f commit dd1d942

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

cpp/src/arrow/util/bit_stream_utils_internal.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ inline bool BitReader::GetValue(int num_bits, T* v) {
296296
return GetBatch(num_bits, v, 1) == 1;
297297
}
298298

299-
namespace internal {
299+
namespace internal_bit_reader {
300300
template <typename T>
301301
struct unpack_detect {
302302
using type = std::make_unsigned_t<T>;
@@ -306,7 +306,7 @@ template <>
306306
struct unpack_detect<bool> {
307307
using type = uint8_t;
308308
};
309-
} // namespace internal
309+
} // namespace internal_bit_reader
310310

311311
template <typename T>
312312
inline int BitReader::GetBatch(int num_bits, T* v, int batch_size) {
@@ -335,7 +335,7 @@ inline int BitReader::GetBatch(int num_bits, T* v, int batch_size) {
335335
}
336336
}
337337

338-
using unpack_t = typename internal::unpack_detect<T>::type;
338+
using unpack_t = typename internal_bit_reader::unpack_detect<T>::type;
339339

340340
int num_unpacked = ::arrow::internal::unpack(
341341
buffer + byte_offset, reinterpret_cast<unpack_t*>(v + i), batch_size - i, num_bits);

0 commit comments

Comments
 (0)