Merge branch 'branch-0.19' into binaryop-error

rapidsai · Mar 9, 2021 · 43c2def · 43c2def
2 parents 440bf52 + 53929eb
commit 43c2def
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cpp/include/cudf/detail/null_mask.cuh b/cpp/include/cudf/detail/null_mask.cuh
@@ -23,7 +23,7 @@
 
 #include <rmm/cuda_stream_view.hpp>
 
-using cudf::detail::device_span;
+using cudf::device_span;
 
 namespace cudf {
 namespace detail {

diff --git a/cpp/src/bitmask/null_mask.cu b/cpp/src/bitmask/null_mask.cu
@@ -44,7 +44,7 @@
 #include <numeric>
 #include <type_traits>
 
-using cudf::detail::device_span;
+using cudf::device_span;
 
 namespace cudf {
 size_type state_null_count(mask_state state, size_type size)

diff --git a/cpp/src/structs/structs_column_factories.cu b/cpp/src/structs/structs_column_factories.cu
@@ -50,7 +50,7 @@ void superimpose_parent_nullmask(bitmask_type const* parent_null_mask,
       reinterpret_cast<bitmask_type const*>(current_child_mask)};
     std::vector<size_type> begin_bits{0, 0};
     cudf::detail::inplace_bitmask_and(
-      detail::device_span<bitmask_type>(current_child_mask, num_bitmask_words(child.size())),
+      device_span<bitmask_type>(current_child_mask, num_bitmask_words(child.size())),
       masks,
       begin_bits,
       child.size(),