diff options
| author | James Zern <jzern@google.com> | 2018-12-06 23:58:37 -0800 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2018-12-07 17:55:21 -0800 |
| commit | 8f03f719af125250775207afe35c27530cf1326c (patch) | |
| tree | d2b37542707131e4f93c190e79e409b0c8abfd65 /test/dct32x32_test.cc | |
| parent | 418acaa0bd06e0666d5a55743e3a85b83c759619 (diff) | |
| download | libvpx-8f03f719af125250775207afe35c27530cf1326c.tar.gz | |
test/*: use std::*tuple
since:
77fa51003 Replace deprecated scoped_ptr with unique_ptr
c++11 has been required so <tuple> is safe to use
Change-Id: I873cb953104b361a8503b5839a3372ce2b99e73c
Diffstat (limited to 'test/dct32x32_test.cc')
| -rw-r--r-- | test/dct32x32_test.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/dct32x32_test.cc b/test/dct32x32_test.cc index dd902f584..94d6b37fa 100644 --- a/test/dct32x32_test.cc +++ b/test/dct32x32_test.cc @@ -11,6 +11,7 @@ #include <math.h> #include <stdlib.h> #include <string.h> +#include <tuple> #include "third_party/googletest/src/include/gtest/gtest.h" @@ -67,7 +68,7 @@ void reference_32x32_dct_2d(const int16_t input[kNumCoeffs], typedef void (*FwdTxfmFunc)(const int16_t *in, tran_low_t *out, int stride); typedef void (*InvTxfmFunc)(const tran_low_t *in, uint8_t *out, int stride); -typedef ::testing::tuple<FwdTxfmFunc, InvTxfmFunc, int, vpx_bit_depth_t> +typedef std::tuple<FwdTxfmFunc, InvTxfmFunc, int, vpx_bit_depth_t> Trans32x32Param; #if CONFIG_VP9_HIGHBITDEPTH @@ -313,7 +314,7 @@ TEST_P(Trans32x32Test, InverseAccuracy) { } } -using ::testing::make_tuple; +using std::make_tuple; #if CONFIG_VP9_HIGHBITDEPTH INSTANTIATE_TEST_CASE_P( |