Fix constraits test failure

uxlfoundation · Dec 20, 2024 · 559ce1e · 559ce1e
1 parent 6ccb883
commit 559ce1e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/include/oneapi/tbb/blocked_nd_range.h b/include/oneapi/tbb/blocked_nd_range.h
@@ -47,11 +47,9 @@ namespace d1 {
 */
 
 template<typename Value, unsigned int N, typename = detail::make_index_sequence<N>>
-    __TBB_requires(blocked_range_value<Value>)
 class blocked_nd_range_impl;
 
 template<typename Value, unsigned int N, std::size_t... Is>
-    __TBB_requires(blocked_range_value<Value>)
 class blocked_nd_range_impl<Value, N, detail::index_sequence<Is...>> {
 public:
     //! Type of a value.
@@ -142,9 +140,9 @@ class blocked_nd_range_impl<Value, N, detail::index_sequence<Is...>> {
 };
 
 template<typename Value, unsigned int N>
+         __TBB_requires(blocked_range_value<Value>)
 class blocked_nd_range : public blocked_nd_range_impl<Value, N> {
     using base = blocked_nd_range_impl<Value, N>;
-
     // Making constructors of base class visible
     using base::base;
 };

diff --git a/include/oneapi/tbb/blocked_range.h b/include/oneapi/tbb/blocked_range.h
@@ -151,8 +151,12 @@ class blocked_range {
     friend class blocked_range3d;
 
     template<typename DimValue, unsigned int N, typename>
+<<<<<<< HEAD
         __TBB_requires(blocked_range_value<DimValue>)
     friend class blocked_nd_range_impl;
+=======
+    friend class blocked_rangeNd_impl;
+>>>>>>> 3fe65dcb (Fix constraits test failure)
 };
 
 } // namespace d1