diff options
author | Jeff McGlynn <jwmcglynn@google.com> | 2018-08-15 11:44:25 -0700 |
---|---|---|
committer | Jeff McGlynn <jwmcglynn@google.com> | 2018-08-15 11:48:50 -0700 |
commit | 06beed61ea806970a8c6023daf20436c2e65f25d (patch) | |
tree | ebf4d7242c397d31aafae6f4b1d991a2918caa2b /src/base/test/bottom_n_test.cpp | |
parent | d16f2f6c3c7c2f899fde35782e1ee978877bb14b (diff) |
Fix compilation errors with mingw
Fix minor build errors when building with mingw in the Android
Emulator's build system:
* Passing initializer list to pushAll helper can't deduce template
argument with mingw, fix by adding an explicit type.
* Add inline to image_utils helpers so that mingw doesn't think that the
functions are declared but not used.
Change-Id: I223e1a74380f9990dbab13ce41e377c3004f43b0
Diffstat (limited to 'src/base/test/bottom_n_test.cpp')
-rw-r--r-- | src/base/test/bottom_n_test.cpp | 18 |
1 files changed, 9 insertions, 9 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)); |