diff options
author | James Zern <jzern@google.com> | 2018-03-28 12:42:27 -0700 |
---|---|---|
committer | James Zern <jzern@google.com> | 2018-03-28 12:45:35 -0700 |
commit | db49a22cfa618479b963d40e7ef7c48a6bc4a97e (patch) | |
tree | d5e5843550211da1ce0bdb7a7fa9db43ba9aa98e /test/test_vector_test.cc | |
parent | debd86ec82f5fc9a37f5f3a828ff9ab0815a9c55 (diff) | |
download | libvpx-db49a22cfa618479b963d40e7ef7c48a6bc4a97e.tar libvpx-db49a22cfa618479b963d40e7ef7c48a6bc4a97e.tar.gz libvpx-db49a22cfa618479b963d40e7ef7c48a6bc4a97e.tar.bz2 libvpx-db49a22cfa618479b963d40e7ef7c48a6bc4a97e.zip |
test: use testing::*tuple instead of std::tr1
googletest imports tuple into testing to allow for compatibility across
c++ versions where tuple may be in std::tr1 or std. fixes deprecation
warnings under visual studio 2017
Change-Id: Id78b372d5478b12d8c8f63fd3f2166fec25aa8be
Diffstat (limited to 'test/test_vector_test.cc')
-rw-r--r-- | test/test_vector_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/test_vector_test.cc b/test/test_vector_test.cc index 1879b3d27..b0f2b818d 100644 --- a/test/test_vector_test.cc +++ b/test/test_vector_test.cc @@ -31,7 +31,7 @@ namespace { const int kThreads = 0; const int kFileName = 1; -typedef std::tr1::tuple<int, const char *> DecodeParam; +typedef ::testing::tuple<int, const char *> DecodeParam; class TestVectorTest : public ::libvpx_test::DecoderTest, public ::libvpx_test::CodecTestWithParam<DecodeParam> { @@ -88,12 +88,12 @@ class TestVectorTest : public ::libvpx_test::DecoderTest, // the test failed. TEST_P(TestVectorTest, MD5Match) { const DecodeParam input = GET_PARAM(1); - const std::string filename = std::tr1::get<kFileName>(input); + const std::string filename = ::testing::get<kFileName>(input); vpx_codec_flags_t flags = 0; vpx_codec_dec_cfg_t cfg = vpx_codec_dec_cfg_t(); char str[256]; - cfg.threads = std::tr1::get<kThreads>(input); + cfg.threads = ::testing::get<kThreads>(input); snprintf(str, sizeof(str) / sizeof(str[0]) - 1, "file: %s threads: %d", filename.c_str(), cfg.threads); |