Skip to content

Add constexpr begin(), end(), cbegin(), cend() to FixedArray, Index, Offset, and Size #3236

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

Merged
hjmjohnson merged 4 commits into from
Mar 1, 2022
Merged

Add constexpr begin(), end(), cbegin(), cend() to FixedArray, Index, Offset, and Size #3236

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76031c1
STYLE: Remove function-style casts to iterator from Index, Offset, Size
N-Dekker Feb 26, 2022
1a7ec3e
ENH: Add `cbegin()` and `cend()` member functions to Index, Offset, Size
N-Dekker Feb 26, 2022
a7c848c
ENH: Declare begin(), end() of FixedArray, Index, Offset, Size constexpr
N-Dekker Feb 27, 2022
9f1c34e
ENH: Test constexpr begin(), end() of FixedArray, Index, Offset, Size
N-Dekker Feb 28, 2022
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
12 changes: 6 additions & 6 deletions Modules/Core/Common/include/itkFixedArray.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,37 +322,37 @@ class ITK_TEMPLATE_EXPORT FixedArray

itkLegacyMacro(ConstReverseIterator rEnd() const);

const_iterator
constexpr const_iterator
cbegin() const noexcept
{
return m_InternalArray;
}

iterator
constexpr iterator
begin() noexcept
{
return m_InternalArray;
}

const_iterator
constexpr const_iterator
begin() const noexcept
{
return this->cbegin();
}

const_iterator
constexpr const_iterator
cend() const noexcept
{
return m_InternalArray + VLength;
}

iterator
constexpr iterator
end() noexcept
{
return m_InternalArray + VLength;
}

const_iterator
constexpr const_iterator
end() const noexcept
{
return this->cend();
Expand Down
28 changes: 20 additions & 8 deletions Modules/Core/Common/include/itkIndex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,28 +346,40 @@ struct ITK_TEMPLATE_EXPORT Index final
std::swap(m_InternalArray, other.m_InternalArray);
}

iterator
constexpr const_iterator
cbegin() const
{
return &m_InternalArray[0];
}

constexpr iterator
begin()
{
return iterator(&m_InternalArray[0]);
return &m_InternalArray[0];
}

const_iterator
constexpr const_iterator
begin() const
{
return const_iterator(&m_InternalArray[0]);
return &m_InternalArray[0];
}

constexpr const_iterator
cend() const
{
return &m_InternalArray[VDimension];
}

iterator
constexpr iterator
end()
{
return iterator(&m_InternalArray[VDimension]);
return &m_InternalArray[VDimension];
}

const_iterator
constexpr const_iterator
end() const
{
return const_iterator(&m_InternalArray[VDimension]);
return &m_InternalArray[VDimension];
}

reverse_iterator
Expand Down
28 changes: 20 additions & 8 deletions Modules/Core/Common/include/itkOffset.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,28 +299,40 @@ struct ITK_TEMPLATE_EXPORT Offset final
std::swap(m_InternalArray, other.m_InternalArray);
}

iterator
constexpr const_iterator
cbegin() const
{
return &m_InternalArray[0];
}

constexpr iterator
begin()
{
return iterator(&m_InternalArray[0]);
return &m_InternalArray[0];
}

const_iterator
constexpr const_iterator
begin() const
{
return const_iterator(&m_InternalArray[0]);
return &m_InternalArray[0];
}

constexpr const_iterator
cend() const
{
return &m_InternalArray[VDimension];
}

iterator
constexpr iterator
end()
{
return iterator(&m_InternalArray[VDimension]);
return &m_InternalArray[VDimension];
}

const_iterator
constexpr const_iterator
end() const
{
return const_iterator(&m_InternalArray[VDimension]);
return &m_InternalArray[VDimension];
}

reverse_iterator
Expand Down
28 changes: 20 additions & 8 deletions Modules/Core/Common/include/itkSize.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,28 +258,40 @@ struct ITK_TEMPLATE_EXPORT Size final
std::swap(m_InternalArray, other.m_InternalArray);
}

iterator
constexpr const_iterator
cbegin() const
{
return &m_InternalArray[0];
}

constexpr iterator
begin()
{
return iterator(&m_InternalArray[0]);
return &m_InternalArray[0];
}

const_iterator
constexpr const_iterator
begin() const
{
return const_iterator(&m_InternalArray[0]);
return &m_InternalArray[0];
}

constexpr const_iterator
cend() const
{
return &m_InternalArray[VDimension];
}

iterator
constexpr iterator
end()
{
return iterator(&m_InternalArray[VDimension]);
return &m_InternalArray[VDimension];
}

const_iterator
constexpr const_iterator
end() const
{
return const_iterator(&m_InternalArray[VDimension]);
return &m_InternalArray[VDimension];
}

reverse_iterator
Expand Down