Skip to content

Commit

Permalink
fixes merge conflict for policz pruning (#2466)
Browse files Browse the repository at this point in the history
  • Loading branch information
elstehle authored Sep 26, 2024
1 parent bda69fd commit cc01ce7
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions cub/cub/util_device.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ private:
template <int, typename FunctorT>
CUB_RUNTIME_FUNCTION _CCCL_FORCEINLINE static cudaError_t invoke_static(FunctorT&, ::cuda::std::false_type)
{
_LIBCUDACXX_UNREACHABLE();
_CCCL_UNREACHABLE();
}

template <typename FunctorT>
Expand All @@ -706,7 +706,7 @@ private:
template <typename FunctorT>
CUB_RUNTIME_FUNCTION _CCCL_FORCEINLINE static cudaError_t do_invoke(FunctorT&, ::cuda::std::false_type)
{
_LIBCUDACXX_UNREACHABLE();
_CCCL_UNREACHABLE();
}
};

Expand Down Expand Up @@ -737,7 +737,7 @@ private:
template <int, typename FunctorT>
CUB_RUNTIME_FUNCTION _CCCL_FORCEINLINE static cudaError_t invoke_static(FunctorT&, ::cuda::std::false_type)
{
_LIBCUDACXX_UNREACHABLE();
_CCCL_UNREACHABLE();
}
};

Expand Down

0 comments on commit cc01ce7

Please sign in to comment.