Skip to content

Use size_t for array or vector index #128

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
merged 1 commit into from
Aug 31, 2016
Merged

Use size_t for array or vector index #128

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
30 changes: 15 additions & 15 deletions UnitTest++/Checks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ namespace UnitTest {

template< typename Expected, typename Actual >
void CheckArrayEqual(TestResults& results, Expected const& expected, Actual const& actual,
int const count, TestDetails const& details)
size_t const count, TestDetails const& details)
{
bool equal = true;
for (int i = 0; i < count; ++i)
for (size_t i = 0; i < count; ++i)
equal &= (expected[i] == actual[i]);

if (!equal)
Expand All @@ -69,12 +69,12 @@ namespace UnitTest {

stream << "Expected [ ";

for (int expectedIndex = 0; expectedIndex < count; ++expectedIndex)
for (size_t expectedIndex = 0; expectedIndex < count; ++expectedIndex)
stream << expected[expectedIndex] << " ";

stream << "] but was [ ";

for (int actualIndex = 0; actualIndex < count; ++actualIndex)
for (size_t actualIndex = 0; actualIndex < count; ++actualIndex)
stream << actual[actualIndex] << " ";

stream << "]";
Expand All @@ -84,17 +84,17 @@ namespace UnitTest {
}

template< typename Expected, typename Actual, typename Tolerance >
bool ArrayAreClose(Expected const& expected, Actual const& actual, int const count, Tolerance const& tolerance)
bool ArrayAreClose(Expected const& expected, Actual const& actual, size_t const count, Tolerance const& tolerance)
{
bool equal = true;
for (int i = 0; i < count; ++i)
for (size_t i = 0; i < count; ++i)
equal &= AreClose(expected[i], actual[i], tolerance);
return equal;
}

template< typename Expected, typename Actual, typename Tolerance >
void CheckArrayClose(TestResults& results, Expected const& expected, Actual const& actual,
int const count, Tolerance const& tolerance, TestDetails const& details)
size_t const count, Tolerance const& tolerance, TestDetails const& details)
{
bool equal = ArrayAreClose(expected, actual, count, tolerance);

Expand All @@ -103,11 +103,11 @@ namespace UnitTest {
UnitTest::MemoryOutStream stream;

stream << "Expected [ ";
for (int expectedIndex = 0; expectedIndex < count; ++expectedIndex)
for (size_t expectedIndex = 0; expectedIndex < count; ++expectedIndex)
stream << expected[expectedIndex] << " ";
stream << "] +/- " << tolerance << " but was [ ";

for (int actualIndex = 0; actualIndex < count; ++actualIndex)
for (size_t actualIndex = 0; actualIndex < count; ++actualIndex)
stream << actual[actualIndex] << " ";
stream << "]";

Expand All @@ -117,10 +117,10 @@ namespace UnitTest {

template< typename Expected, typename Actual, typename Tolerance >
void CheckArray2DClose(TestResults& results, Expected const& expected, Actual const& actual,
int const rows, int const columns, Tolerance const& tolerance, TestDetails const& details)
size_t const rows, size_t const columns, Tolerance const& tolerance, TestDetails const& details)
{
bool equal = true;
for (int i = 0; i < rows; ++i)
for (size_t i = 0; i < rows; ++i)
equal &= ArrayAreClose(expected[i], actual[i], columns, tolerance);

if (!equal)
Expand All @@ -129,20 +129,20 @@ namespace UnitTest {

stream << "Expected [ ";

for (int expectedRow = 0; expectedRow < rows; ++expectedRow)
for (size_t expectedRow = 0; expectedRow < rows; ++expectedRow)
{
stream << "[ ";
for (int expectedColumn = 0; expectedColumn < columns; ++expectedColumn)
for (size_t expectedColumn = 0; expectedColumn < columns; ++expectedColumn)
stream << expected[expectedRow][expectedColumn] << " ";
stream << "] ";
}

stream << "] +/- " << tolerance << " but was [ ";

for (int actualRow = 0; actualRow < rows; ++actualRow)
for (size_t actualRow = 0; actualRow < rows; ++actualRow)
{
stream << "[ ";
for (int actualColumn = 0; actualColumn < columns; ++actualColumn)
for (size_t actualColumn = 0; actualColumn < columns; ++actualColumn)
stream << actual[actualRow][actualColumn] << " ";
stream << "] ";
}
Expand Down
8 changes: 4 additions & 4 deletions tests/TestExceptions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ namespace {
class ThrowingObject
{
public:
float operator[](int) const
float operator[](size_t) const
{
throw "Test throw";
}
Expand All @@ -262,7 +262,7 @@ namespace {
class StdThrowingObject
{
public:
float operator[](int) const
float operator[](size_t) const
{
throw std::runtime_error("Test throw");
}
Expand Down Expand Up @@ -451,7 +451,7 @@ namespace {
class ThrowingObject2D
{
public:
float* operator[](int) const
float* operator[](size_t) const
{
throw "Test throw";
}
Expand All @@ -460,7 +460,7 @@ namespace {
class StdThrowingObject2D
{
public:
float* operator[](int) const
float* operator[](size_t) const
{
throw std::runtime_error("Test throw");
}
Expand Down