Fix conflicts

NVIDIA · Oct 29, 2024 · 6ecc316 · 6ecc316
1 parent d65c3bd
commit 6ecc316
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 25 deletions.
diff --git a/include/cuco/detail/static_multimap/static_multimap_ref.inl b/include/cuco/detail/static_multimap/static_multimap_ref.inl
@@ -649,7 +649,7 @@ class operator_impl<
   using const_iterator = typename base_type::const_iterator;
 
   static constexpr auto cg_size     = base_type::cg_size;
-  static constexpr auto window_size = base_type::window_size;
+  static constexpr auto bucket_size = base_type::bucket_size;
 
  public:
   /**

diff --git a/include/cuco/extent.cuh b/include/cuco/extent.cuh
@@ -116,12 +116,6 @@ template <typename Container, typename SizeType, std::size_t N>
  *
  * @deprecated Use the equivalent `make_bucket_extent` instead.
  *
- * @tparam Container Container type to compute the extent for
- * @tparam SizeType Size type
- * @tparam N Extent
- *
- * @param ext The input extent
- *
  * @throw If the input extent is invalid
  *
  * @return Resulting valid `bucket extent`
@@ -155,11 +149,6 @@ template <typename Container, typename SizeType>
  *
  * @deprecated Use the equivalent `make_bucket_extent` instead.
  *
- * @tparam Container Container type to compute the extent for
- * @tparam SizeType Size type
- *
- * @param size The input size
- *
  * @throw If the input size is invalid
  *
  * @return Resulting valid extent
@@ -195,13 +184,6 @@ template <int32_t CGSize, int32_t BucketSize, typename SizeType, std::size_t N>
  *
  * @deprecated Use the equivalent `make_bucket_extent` instead.
  *
- * @tparam CGSize Number of elements handled per CG
- * @tparam BucketSize Number of elements handled per Bucket
- * @tparam SizeType Size type
- * @tparam N Extent
- *
- * @param ext The input extent
- *
  * @throw If the input extent is invalid
  *
  * @return Resulting valid extent
@@ -236,12 +218,6 @@ template <int32_t CGSize, int32_t BucketSize, typename SizeType>
  *
  * @deprecated Use the equivalent `make_bucket_extent` instead.
  *
- * @tparam CGSize Number of elements handled per CG
- * @tparam BucketSize Number of elements handled per Bucket
- * @tparam SizeType Size type
- *
- * @param size The input size
- *
  * @throw If the input size is invalid
  *
  * @return Resulting valid extent