diff options
| -rw-r--r-- | src/base/test/bottom_n_test.cpp | 18 | ||||
| -rw-r--r-- | src/decoder/test/image_utils.h | 12 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/base/test/bottom_n_test.cpp b/src/base/test/bottom_n_test.cpp index 8a48d30..76f0123 100644 --- a/src/base/test/bottom_n_test.cpp +++ b/src/base/test/bottom_n_test.cpp @@ -33,7 +33,7 @@ TEST(BottomN, Sort) { { BottomN<int> heap(10); EXPECT_TRUE(heap.Empty()); - pushAll(heap, {1, 2}); + pushAll(heap, (int[]){1, 2}); EXPECT_EQ(heap.Size(), 2); EXPECT_FALSE(heap.Empty()); @@ -42,7 +42,7 @@ TEST(BottomN, Sort) { { BottomN<int> heap(6); - pushAll(heap, {1, 4, 3, 2, 2, 1}); + pushAll(heap, (int[]){1, 4, 3, 2, 2, 1}); EXPECT_EQ(heap.Size(), 6); EXPECT_THAT(heap.Pop(), ElementsAre(1, 1, 2, 2, 3, 4)); @@ -52,7 +52,7 @@ TEST(BottomN, Sort) { TEST(BottomN, Bounds) { { BottomN<int> heap(4); - pushAll(heap, {1, 2, 3, 4}); + pushAll(heap, (int[]){1, 2, 3, 4}); EXPECT_EQ(heap.Size(), 4); heap.Push(0); @@ -63,10 +63,10 @@ TEST(BottomN, Bounds) { { BottomN<int> heap(4); - pushAll(heap, {4, 3, 2, 1}); + pushAll(heap, (int[]){4, 3, 2, 1}); EXPECT_EQ(heap.Size(), 4); - pushAll(heap, {4, 4, 4, 4}); + pushAll(heap, (int[]){4, 4, 4, 4}); EXPECT_EQ(heap.Size(), 4); EXPECT_THAT(heap.Pop(), ElementsAre(1, 2, 3, 4)); @@ -74,10 +74,10 @@ TEST(BottomN, Bounds) { { BottomN<int> heap(4); - pushAll(heap, {4, 3, 2, 1}); + pushAll(heap, (int[]){4, 3, 2, 1}); EXPECT_EQ(heap.Size(), 4); - pushAll(heap, {5, 5, 5, 5}); + pushAll(heap, (int[]){5, 5, 5, 5}); EXPECT_EQ(heap.Size(), 4); EXPECT_THAT(heap.Pop(), ElementsAre(1, 2, 3, 4)); @@ -85,10 +85,10 @@ TEST(BottomN, Bounds) { { BottomN<int> heap(4); - pushAll(heap, {4, 3, 2, 1}); + pushAll(heap, (int[]){4, 3, 2, 1}); EXPECT_EQ(heap.Size(), 4); - pushAll(heap, {0, 0, 0, 0}); + pushAll(heap, (int[]){0, 0, 0, 0}); EXPECT_EQ(heap.Size(), 4); EXPECT_THAT(heap.Pop(), ElementsAre(0, 0, 0, 0)); diff --git a/src/decoder/test/image_utils.h b/src/decoder/test/image_utils.h index adfded5..1e5000a 100644 --- a/src/decoder/test/image_utils.h +++ b/src/decoder/test/image_utils.h @@ -90,7 +90,7 @@ static void PrintTo(const vector<uint8_t>& vec, ostream* os) { } } // namespace std -static std::string LoadFile(const std::string& path) { +static inline std::string LoadFile(const std::string& path) { std::ifstream is(path, std::ios::binary); EXPECT_TRUE(is) << "Failed to load file " << path; if (!is) { @@ -102,7 +102,7 @@ static std::string LoadFile(const std::string& path) { return ss.str(); } -static std::string LoadASTCFile(const std::string& basename) { +static inline std::string LoadASTCFile(const std::string& basename) { const std::string filename = std::string("src/decoder/testdata/") + basename + ".astc"; @@ -116,7 +116,7 @@ static std::string LoadASTCFile(const std::string& basename) { } } -static void LoadGoldenBmp(const std::string& path, ImageBuffer* result) { +static inline void LoadGoldenBmp(const std::string& path, ImageBuffer* result) { constexpr size_t kBmpHeaderSize = 54; SCOPED_TRACE(testing::Message() << "LoadGoldenBmp " << path); @@ -191,9 +191,9 @@ static void LoadGoldenBmp(const std::string& path, ImageBuffer* result) { } } -static void CompareSumOfSquaredDifferences(const ImageBuffer& golden, - const ImageBuffer& image, - double threshold) { +static inline void CompareSumOfSquaredDifferences(const ImageBuffer& golden, + const ImageBuffer& image, + double threshold) { ASSERT_EQ(golden.DataSize(), image.DataSize()); ASSERT_EQ(golden.Stride(), image.Stride()); ASSERT_EQ(golden.BytesPerPixel(), image.BytesPerPixel()); |