From b1c534bb9d7aae196c3356621f67557276a5da36 Mon Sep 17 00:00:00 2001
From: Ruslan Arutyunyan <ruslan.arutyunyan@intel.com>
Date: Tue, 14 Jan 2025 04:50:41 -0700
Subject: [PATCH] Enable CTAD for blocked_rangeNd since C++17 (#1524)

Co-authored-by: Boyarinov, Konstantin <konstantin.boyarinov@intel.com>
---
 include/oneapi/tbb/blocked_nd_range.h | 11 +++++++----
 include/oneapi/tbb/blocked_range.h    |  3 +--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/oneapi/tbb/blocked_nd_range.h b/include/oneapi/tbb/blocked_nd_range.h
index 3a9697896f..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.
@@ -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,7 +140,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>;
+         __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;
+};
 
 } // namespace d1
 } // namespace detail
diff --git a/include/oneapi/tbb/blocked_range.h b/include/oneapi/tbb/blocked_range.h
index 5193faffd5..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.
@@ -151,7 +151,6 @@ class blocked_range {
     friend class blocked_range3d;
 
     template<typename DimValue, unsigned int N, typename>
-        __TBB_requires(blocked_range_value<DimValue>)
     friend class blocked_nd_range_impl;
 };