Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable CTAD for blocked_rangeNd since C++17 #1524

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Enable CTAD for blocked_rangeNd since C++17 #1524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eeed3f8
Enable CTAD for blocked_rangeNd since C++17
rarutyun Oct 7, 2024
3fe65dc
Fix constraits test failure
rarutyun Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion include/oneapi/tbb/blocked_range.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_rangeNd_impl;
};

Expand Down
9 changes: 6 additions & 3 deletions include/oneapi/tbb/blocked_rangeNd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,9 @@ namespace d1 {
*/

template<typename Value, unsigned int N, typename = detail::make_index_sequence<N>>
__TBB_requires(blocked_range_value<Value>)
class blocked_rangeNd_impl;

template<typename Value, unsigned int N, std::size_t... Is>
__TBB_requires(blocked_range_value<Value>)
class blocked_rangeNd_impl<Value, N, detail::index_sequence<Is...>> {
public:
//! Type of a value.
Expand Down Expand Up @@ -133,7 +131,12 @@ class blocked_rangeNd_impl<Value, N, detail::index_sequence<Is...>> {
};

template<typename Value, unsigned int N>
using blocked_rangeNd = blocked_rangeNd_impl<Value, N>;
__TBB_requires(blocked_range_value<Value>)
class blocked_rangeNd : public blocked_rangeNd_impl<Value, N> {
using base = blocked_rangeNd_impl<Value, N>;
// Making constructors of base class visible
using base::base;
};

} // namespace d1
} // namespace detail
Expand Down
Loading