Skip to content

Commit b32ab83

Browse files
committed
Address review comments
Just a few comment fixes, and rename of a helper class
1 parent 0fd398f commit b32ab83

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

include/experimental/__p2630_bits/submdspan_mapping.hpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,9 @@ struct deduce_layout_left_submapping<
185185
// We are reusing the same thing for layout_left and layout_left_padded
186186
// For layout_left as source StaticStride is static_extent(0)
187187
template<class Extents, size_t NumGaps, size_t StaticStride>
188-
struct Compute_S_static_layout_left {
189-
// Neither StaticStride nor any of the looked for extents can zero.
190-
// StaticStride never can be zero, the static_extents we are looking at are associated with
188+
struct compute_s_static_layout_left {
189+
// Neither StaticStride nor any of the provided extents can be zero.
190+
// StaticStride can never be zero, the static_extents we are looking at are associated with
191191
// integral slice specifiers - which wouldn't be valid for zero extent
192192
template<size_t ... Idx>
193193
MDSPAN_INLINE_FUNCTION
@@ -231,7 +231,7 @@ layout_left::mapping<Extents>::submdspan_mapping_impl(
231231
return submdspan_mapping_result<dst_mapping_t>{dst_mapping_t(dst_ext),
232232
offset};
233233
} else if constexpr (deduce_layout::layout_left_padded_value()) {
234-
constexpr size_t S_static = MDSPAN_IMPL_STANDARD_NAMESPACE::detail::Compute_S_static_layout_left<Extents, deduce_layout::gap_len, Extents::static_extent(0)>::value(std::make_index_sequence<Extents::rank()>());
234+
constexpr size_t S_static = MDSPAN_IMPL_STANDARD_NAMESPACE::detail::compute_s_static_layout_left<Extents, deduce_layout::gap_len, Extents::static_extent(0)>::value(std::make_index_sequence<Extents::rank()>());
235235
using dst_mapping_t = typename MDSPAN_IMPL_PROPOSED_NAMESPACE::layout_left_padded<S_static>::template mapping<dst_ext_t>;
236236
return submdspan_mapping_result<dst_mapping_t>{
237237
dst_mapping_t(dst_ext, stride(1 + deduce_layout::gap_len)), offset};
@@ -299,7 +299,7 @@ MDSPAN_IMPL_PROPOSED_NAMESPACE::layout_left_padded<PaddingValue>::mapping<Extent
299299
using dst_mapping_t = typename layout_left::template mapping<dst_ext_t>;
300300
return submdspan_mapping_result<dst_mapping_t>{dst_mapping_t{dst_ext}, offset};
301301
} else if constexpr (deduce_layout::layout_left_padded_value()) { // can keep layout_left_padded
302-
constexpr size_t S_static = MDSPAN_IMPL_STANDARD_NAMESPACE::detail::Compute_S_static_layout_left<Extents, deduce_layout::gap_len, static_padding_stride>::value(std::make_index_sequence<Extents::rank()>());
302+
constexpr size_t S_static = MDSPAN_IMPL_STANDARD_NAMESPACE::detail::compute_s_static_layout_left<Extents, deduce_layout::gap_len, static_padding_stride>::value(std::make_index_sequence<Extents::rank()>());
303303
using dst_mapping_t = typename MDSPAN_IMPL_PROPOSED_NAMESPACE::layout_left_padded<S_static>::template mapping<dst_ext_t>;
304304
return submdspan_mapping_result<dst_mapping_t>{
305305
dst_mapping_t(dst_ext, stride(1 + deduce_layout::gap_len)), offset};
@@ -405,9 +405,9 @@ struct deduce_layout_right_submapping<
405405
// We are reusing the same thing for layout_right and layout_right_padded
406406
// For layout_right as source StaticStride is static_extent(Rank-1)
407407
template<class Extents, size_t NumGaps, size_t StaticStride>
408-
struct Compute_S_static_layout_right {
409-
// Neither StaticStride nor any of the looked for extents can zero.
410-
// StaticStride never can be zero, the static_extents we are looking at are associated with
408+
struct compute_s_static_layout_right {
409+
// Neither StaticStride nor any of the provided extents can be zero.
410+
// StaticStride can never be zero, the static_extents we are looking at are associated with
411411
// integral slice specifiers - which wouldn't be valid for zero extent
412412
template<size_t ... Idx>
413413
MDSPAN_INLINE_FUNCTION
@@ -451,7 +451,7 @@ layout_right::mapping<Extents>::submdspan_mapping_impl(
451451
return submdspan_mapping_result<dst_mapping_t>{dst_mapping_t(dst_ext),
452452
offset};
453453
} else if constexpr (deduce_layout::layout_right_padded_value()) {
454-
constexpr size_t S_static = MDSPAN_IMPL_STANDARD_NAMESPACE::detail::Compute_S_static_layout_left<Extents, deduce_layout::gap_len, Extents::static_extent(Extents::rank() - 1)>::value(std::make_index_sequence<Extents::rank()>());
454+
constexpr size_t S_static = MDSPAN_IMPL_STANDARD_NAMESPACE::detail::compute_s_static_layout_left<Extents, deduce_layout::gap_len, Extents::static_extent(Extents::rank() - 1)>::value(std::make_index_sequence<Extents::rank()>());
455455
using dst_mapping_t = typename MDSPAN_IMPL_PROPOSED_NAMESPACE::layout_right_padded<S_static>::template mapping<dst_ext_t>;
456456
return submdspan_mapping_result<dst_mapping_t>{
457457
dst_mapping_t(dst_ext,
@@ -521,7 +521,7 @@ MDSPAN_IMPL_PROPOSED_NAMESPACE::layout_right_padded<PaddingValue>::mapping<Exten
521521
using dst_mapping_t = typename layout_right::template mapping<dst_ext_t>;
522522
return submdspan_mapping_result<dst_mapping_t>{dst_mapping_t{dst_ext}, offset};
523523
} else if constexpr (deduce_layout::layout_right_padded_value()) { // can keep layout_right_padded
524-
constexpr size_t S_static = MDSPAN_IMPL_STANDARD_NAMESPACE::detail::Compute_S_static_layout_right<Extents, deduce_layout::gap_len, static_padding_stride>::value(std::make_index_sequence<Extents::rank()>());
524+
constexpr size_t S_static = MDSPAN_IMPL_STANDARD_NAMESPACE::detail::compute_s_static_layout_right<Extents, deduce_layout::gap_len, static_padding_stride>::value(std::make_index_sequence<Extents::rank()>());
525525
using dst_mapping_t = typename MDSPAN_IMPL_PROPOSED_NAMESPACE::layout_right_padded<S_static>::template mapping<dst_ext_t>;
526526
return submdspan_mapping_result<dst_mapping_t>{
527527
dst_mapping_t(dst_ext, stride(Extents::rank() - 2 - deduce_layout::gap_len)), offset};

0 commit comments

Comments
 (0)