Resolve conflicts

NVIDIA · Dec 11, 2023 · ab6c6ed · ab6c6ed
1 parent 64ed630
commit ab6c6ed
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/include/cuco/detail/extent/extent.inl b/include/cuco/detail/extent/extent.inl
@@ -31,7 +31,8 @@ template <typename SizeType, std::size_t N>
 struct window_extent {
   using value_type = SizeType;  ///< Extent value type
 
-  __host__ __device__ explicit constexpr operator value_type() const noexcept { return N; }
+  __host__ __device__ constexpr value_type value() const noexcept { return N; }
+  __host__ __device__ explicit constexpr operator value_type() const noexcept { return value(); }
 
  private:
   __host__ __device__ explicit constexpr window_extent() noexcept {}
@@ -128,6 +129,5 @@ template <typename T>
 inline constexpr bool is_window_extent_v = is_window_extent<T>::value;
 
 }  // namespace detail
-
 }  // namespace experimental
 }  // namespace cuco
diff --git a/include/cuco/utility/fast_int.cuh b/include/cuco/utility/fast_int.cuh
@@ -51,6 +51,13 @@ struct fast_int {
     evaluate_magic_numbers();
   }
 
+  /**
+   * @brief Get the underlying integer value.
+   *
+   * @return Underlying value
+   */
+  __host__ __device__ constexpr value_type value() const noexcept { return value_; }
+
   /**
    * @brief Explicit conversion operator to the underlying value type.
    *