Skip to content

COMP: Fixed IndexRange warnings -Wshadow -Wmissing-field-initializers #171

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
dzenanz merged 1 commit into from
Nov 13, 2018
Merged

COMP: Fixed IndexRange warnings -Wshadow -Wmissing-field-initializers #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Modules/Core/Common/include/itkIndexRange.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,12 +294,12 @@ class IndexRange final

/** Constructs a range of indices for the specified grid size.
*/
explicit IndexRange(const SizeType& size)
explicit IndexRange(const SizeType& gridSize)
:
// Note: Use parentheses instead of curly braces to initialize data members,
// to avoid AppleClang 6.0.0.6000056 compile errors, "no viable conversion..."
m_MinIndex(),
m_MaxIndex(CalculateMaxIndex({}, size))
m_MaxIndex(CalculateMaxIndex({}, gridSize))
{
}

Expand Down
4 changes: 2 additions & 2 deletions Modules/Core/Common/test/itkIndexRangeGTest.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ TEST(IndexRange, IteratorsCanBePassedToStdForEach)

std::for_each(range.begin(), range.end(), [](const IndexType index)
{
EXPECT_TRUE(index >= IndexType{});
EXPECT_TRUE(index >= IndexType());
});
}

Expand All @@ -155,7 +155,7 @@ TEST(IndexRange, CanBeUsedAsExpressionOfRangeBasedForLoop)

for (auto&& index : range)
{
EXPECT_TRUE(index >= IndexType{});
EXPECT_TRUE(index >= IndexType());
}
}

Expand Down