Index: webrtc/system_wrappers/source/aligned_array_unittest.cc |
diff --git a/webrtc/system_wrappers/source/aligned_array_unittest.cc b/webrtc/system_wrappers/source/aligned_array_unittest.cc |
index 8b8d50dae1fb4f9fb5e472fb9d99e1827518777e..477febaa3de3edf719109f0435457c71557a8f67 100644 |
--- a/webrtc/system_wrappers/source/aligned_array_unittest.cc |
+++ b/webrtc/system_wrappers/source/aligned_array_unittest.cc |
@@ -16,7 +16,7 @@ |
namespace { |
-bool IsAligned(const void* ptr, int alignment) { |
+bool IsAligned(const void* ptr, size_t alignment) { |
return reinterpret_cast<uintptr_t>(ptr) % alignment == 0; |
} |
@@ -27,7 +27,7 @@ namespace webrtc { |
TEST(AlignedArrayTest, CheckAlignment) { |
AlignedArray<bool> arr(10, 7, 128); |
ASSERT_TRUE(IsAligned(arr.Array(), 128)); |
- for (int i = 0; i < 10; ++i) { |
+ for (size_t i = 0; i < 10; ++i) { |
ASSERT_TRUE(IsAligned(arr.Row(i), 128)); |
ASSERT_EQ(arr.Row(i), arr.Array()[i]); |
} |
@@ -36,13 +36,13 @@ TEST(AlignedArrayTest, CheckAlignment) { |
TEST(AlignedArrayTest, CheckOverlap) { |
AlignedArray<size_t> arr(10, 7, 128); |
- for (int i = 0; i < 10; ++i) { |
+ for (size_t i = 0; i < 10; ++i) { |
for (size_t j = 0; j < 7; ++j) { |
arr.At(i, j) = 20 * i + j; |
} |
} |
- for (int i = 0; i < 10; ++i) { |
+ for (size_t i = 0; i < 10; ++i) { |
for (size_t j = 0; j < 7; ++j) { |
ASSERT_EQ(arr.At(i, j), 20 * i + j); |
ASSERT_EQ(arr.Row(i)[j], 20 * i + j); |
@@ -53,7 +53,7 @@ TEST(AlignedArrayTest, CheckOverlap) { |
TEST(AlignedArrayTest, CheckRowsCols) { |
AlignedArray<bool> arr(10, 7, 128); |
- ASSERT_EQ(arr.rows(), 10); |
+ ASSERT_EQ(arr.rows(), 10u); |
ASSERT_EQ(arr.cols(), 7u); |
} |