Used size_t for CHECK macros

killoctal · killoctal · commit eca039304b7e · 2016-08-29T22:36:31.000+02:00
diff --git a/UnitTest++/Checks.h b/UnitTest++/Checks.h
@@ -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)
@@ -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 << "]";
@@ -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);
 
@@ -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 << "]";
 
@@ -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)
@@ -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 << "] ";
          }
diff --git a/tests/TestExceptions.cpp b/tests/TestExceptions.cpp
@@ -253,7 +253,7 @@ namespace {
    class ThrowingObject
    {
    public:
-      float operator[](int) const
+      float operator[](size_t) const
       {
          throw "Test throw";
       }
@@ -262,7 +262,7 @@ namespace {
    class StdThrowingObject
    {
    public:
-      float operator[](int) const
+      float operator[](size_t) const
       {
          throw std::runtime_error("Test throw");
       }
@@ -451,7 +451,7 @@ namespace {
       class ThrowingObject2D
       {
       public:
-         float* operator[](int) const
+         float* operator[](size_t) const
          {
             throw "Test throw";
          }
@@ -460,7 +460,7 @@ namespace {
       class StdThrowingObject2D
       {
       public:
-         float* operator[](int) const
+         float* operator[](size_t) const
          {
             throw std::runtime_error("Test throw");
          }

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ namespace {`
`253`	`253`	`class ThrowingObject`
`254`	`254`	`{`
`255`	`255`	`public:`
`256`		`- float operator[](int) const`
	`256`	`+ float operator[](size_t) const`
`257`	`257`	`{`
`258`	`258`	`throw "Test throw";`
`259`	`259`	`}`
`@@ -262,7 +262,7 @@ namespace {`
`262`	`262`	`class StdThrowingObject`
`263`	`263`	`{`
`264`	`264`	`public:`
`265`		`- float operator[](int) const`
	`265`	`+ float operator[](size_t) const`
`266`	`266`	`{`
`267`	`267`	`throw std::runtime_error("Test throw");`
`268`	`268`	`}`
`@@ -451,7 +451,7 @@ namespace {`
`451`	`451`	`class ThrowingObject2D`
`452`	`452`	`{`
`453`	`453`	`public:`
`454`		`- float* operator[](int) const`
	`454`	`+ float* operator[](size_t) const`
`455`	`455`	`{`
`456`	`456`	`throw "Test throw";`
`457`	`457`	`}`
`@@ -460,7 +460,7 @@ namespace {`
`460`	`460`	`class StdThrowingObject2D`
`461`	`461`	`{`
`462`	`462`	`public:`
`463`		`- float* operator[](int) const`
	`463`	`+ float* operator[](size_t) const`
`464`	`464`	`{`
`465`	`465`	`throw std::runtime_error("Test throw");`
`466`	`466`	`}`