From 6ccb88302e4dfe741fd40bd02d4b649d6fd3500c Mon Sep 17 00:00:00 2001
From: Ruslan Arutyunyan <ruslan.arutyunyan@intel.com>
Date: Mon, 7 Oct 2024 14:24:30 -0600
Subject: [PATCH 1/4] Enable CTAD for blocked_rangeNd since C++17

---
 include/oneapi/tbb/blocked_nd_range.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/oneapi/tbb/blocked_nd_range.h b/include/oneapi/tbb/blocked_nd_range.h
index 3a9697896f..e488173ef8 100644
--- a/include/oneapi/tbb/blocked_nd_range.h
+++ b/include/oneapi/tbb/blocked_nd_range.h
@@ -142,7 +142,12 @@ class blocked_nd_range_impl<Value, N, detail::index_sequence<Is...>> {
 };
 
 template<typename Value, unsigned int N>
-using blocked_nd_range = blocked_nd_range_impl<Value, N>;
+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;
+};
 
 } // namespace d1
 } // namespace detail

From 559ce1e963031e296b2bebacd29e76ad361b4584 Mon Sep 17 00:00:00 2001
From: Ruslan Arutyunyan <ruslan.arutyunyan@intel.com>
Date: Mon, 7 Oct 2024 15:17:08 -0600
Subject: [PATCH 2/4] Fix constraits test failure

---
 include/oneapi/tbb/blocked_nd_range.h | 4 +---
 include/oneapi/tbb/blocked_range.h    | 4 ++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/oneapi/tbb/blocked_nd_range.h b/include/oneapi/tbb/blocked_nd_range.h
index e488173ef8..240d681d27 100644
--- 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
index 5193faffd5..77afcca392 100644
--- 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

From 64610c61f559c0485bbe6c310a52f82c88f2814f Mon Sep 17 00:00:00 2001
From: "Boyarinov, Konstantin" <konstantin.boyarinov@intel.com>
Date: Fri, 20 Dec 2024 04:22:32 -0800
Subject: [PATCH 3/4] Fix merging issue

---
 include/oneapi/tbb/blocked_range.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/include/oneapi/tbb/blocked_range.h b/include/oneapi/tbb/blocked_range.h
index 77afcca392..51312a1a87 100644
--- a/include/oneapi/tbb/blocked_range.h
+++ b/include/oneapi/tbb/blocked_range.h
@@ -151,12 +151,7 @@ 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

From f45b27f1a0b323c1d1a5403f3a649afcf69840e8 Mon Sep 17 00:00:00 2001
From: "Boyarinov, Konstantin" <konstantin.boyarinov@intel.com>
Date: Mon, 13 Jan 2025 06:26:55 -0800
Subject: [PATCH 4/4] Update copyright years

---
 include/oneapi/tbb/blocked_nd_range.h | 2 +-
 include/oneapi/tbb/blocked_range.h    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/oneapi/tbb/blocked_nd_range.h b/include/oneapi/tbb/blocked_nd_range.h
index 240d681d27..53b25eee2d 100644
--- a/include/oneapi/tbb/blocked_nd_range.h
+++ b/include/oneapi/tbb/blocked_nd_range.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2017-2024 Intel Corporation
+    Copyright (c) 2017-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/include/oneapi/tbb/blocked_range.h b/include/oneapi/tbb/blocked_range.h
index 51312a1a87..0bc8693c13 100644
--- a/include/oneapi/tbb/blocked_range.h
+++ b/include/oneapi/tbb/blocked_range.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2005-2024 Intel Corporation
+    Copyright (c) 2005-2025 Intel Corporation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.