]> granicus.if.org Git - libvpx/commitdiff
vp9_end_to_end_test: fix compile with gcc 4.8.5
authorJames Zern <jzern@google.com>
Wed, 27 Jan 2021 02:05:47 +0000 (18:05 -0800)
committerJames Zern <jzern@google.com>
Wed, 27 Jan 2021 02:09:27 +0000 (18:09 -0800)
use Values() rather than ValuesIn() with an initializer list as this
version of gcc under CentOS fails to deduce the type:

../third_party/googletest/src/include/gtest/gtest-param-test.h:304:29:
note:   template argument deduction/substitution failed:
../test/vp9_end_to_end_test.cc:346:59: note:   couldn't deduce template
parameter â€˜T’
                            ::testing::ValuesIn({ 6, 7, 8 }));

Bug: webm:1690
Change-Id: I43d9d4777fcd74a4f8fa8bdcd9834cdca5e546ff

test/vp9_end_to_end_test.cc

index 4e3a78fac4b643245c259116728a9634991101e5..7cc126ea5800f8331e0f3944be9287c85f6222e9 100644 (file)
@@ -342,7 +342,7 @@ VP9_INSTANTIATE_TEST_SUITE(EndToEndTestLarge,
 VP9_INSTANTIATE_TEST_SUITE(EndToEndNV12,
                            ::testing::Values(::libvpx_test::kRealTime),
                            ::testing::ValuesIn(kTestVectorsNv12),
-                           ::testing::ValuesIn({ 6, 7, 8 }));
+                           ::testing::Values(6, 7, 8));
 
 VP9_INSTANTIATE_TEST_SUITE(EndToEndTestAdaptiveRDThresh,
                            ::testing::Values(5, 6, 7), ::testing::Values(8, 9));