From 8f03f719af125250775207afe35c27530cf1326c Mon Sep 17 00:00:00 2001 From: James Zern Date: Thu, 6 Dec 2018 23:58:37 -0800 Subject: [PATCH] test/*: use std::*tuple since: 77fa51003 Replace deprecated scoped_ptr with unique_ptr c++11 has been required so is safe to use Change-Id: I873cb953104b361a8503b5839a3372ce2b99e73c --- test/add_noise_test.cc | 6 ++++-- test/avg_test.cc | 13 +++++++------ test/blockiness_test.cc | 5 +++-- test/codec_factory.h | 12 +++++++----- test/consistency_test.cc | 5 +++-- test/convolve_test.cc | 5 +++-- test/dct16x16_test.cc | 11 +++++------ test/dct32x32_test.cc | 5 +++-- test/dct_partial_test.cc | 6 +++--- test/dct_test.cc | 5 +++-- test/decode_corrupted.cc | 4 +++- test/decode_perf_test.cc | 6 ++++-- test/fdct8x8_test.cc | 9 +++++---- test/lpf_test.cc | 7 ++++--- test/partial_idct_test.cc | 8 ++++---- test/predict_test.cc | 5 +++-- test/quantize_test.cc | 5 +++-- test/sum_squares_test.cc | 5 +++-- test/superframe_test.cc | 6 ++++-- test/test_vector_test.cc | 8 +++++--- test/util.h | 4 +++- test/vp9_block_error_test.cc | 5 +++-- test/vp9_denoiser_test.cc | 6 +++--- test/vp9_quantize_test.cc | 7 ++++--- 24 files changed, 92 insertions(+), 66 deletions(-) diff --git a/test/add_noise_test.cc b/test/add_noise_test.cc index be56dd7..0d1893c 100644 --- a/test/add_noise_test.cc +++ b/test/add_noise_test.cc @@ -8,6 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ #include +#include + #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" @@ -26,7 +28,7 @@ typedef void (*AddNoiseFunc)(uint8_t *start, const int8_t *noise, int blackclamp, int whiteclamp, int width, int height, int pitch); -typedef ::testing::tuple AddNoiseTestFPParam; +typedef std::tuple AddNoiseTestFPParam; class AddNoiseTest : public ::testing::Test, public ::testing::WithParamInterface { @@ -125,7 +127,7 @@ TEST_P(AddNoiseTest, CheckCvsAssembly) { vpx_free(s); } -using ::testing::make_tuple; +using std::make_tuple; INSTANTIATE_TEST_CASE_P( C, AddNoiseTest, diff --git a/test/avg_test.cc b/test/avg_test.cc index 5455f05..9c242c2 100644 --- a/test/avg_test.cc +++ b/test/avg_test.cc @@ -11,6 +11,7 @@ #include #include #include +#include #include "third_party/googletest/src/include/gtest/gtest.h" @@ -95,7 +96,7 @@ class AverageTestBase : public ::testing::Test { }; typedef unsigned int (*AverageFunction)(const uint8_t *s, int pitch); -typedef ::testing::tuple AvgFunc; +typedef std::tuple AvgFunc; class AverageTest : public AverageTestBase, public ::testing::WithParamInterface { @@ -154,7 +155,7 @@ class AverageTestHBD : public AverageTestBase, typedef void (*IntProRowFunc)(int16_t hbuf[16], uint8_t const *ref, const int ref_stride, const int height); -typedef ::testing::tuple IntProRowParam; +typedef std::tuple IntProRowParam; class IntProRowTest : public AverageTestBase, public ::testing::WithParamInterface { @@ -202,7 +203,7 @@ class IntProRowTest : public AverageTestBase, typedef int16_t (*IntProColFunc)(uint8_t const *ref, const int width); -typedef ::testing::tuple IntProColParam; +typedef std::tuple IntProColParam; class IntProColTest : public AverageTestBase, public ::testing::WithParamInterface { @@ -227,7 +228,7 @@ class IntProColTest : public AverageTestBase, }; typedef int (*SatdFunc)(const tran_low_t *coeffs, int length); -typedef ::testing::tuple SatdTestParam; +typedef std::tuple SatdTestParam; class SatdTest : public ::testing::Test, public ::testing::WithParamInterface { @@ -275,7 +276,7 @@ class SatdTest : public ::testing::Test, typedef int64_t (*BlockErrorFunc)(const tran_low_t *coeff, const tran_low_t *dqcoeff, int block_size); -typedef ::testing::tuple BlockErrorTestFPParam; +typedef std::tuple BlockErrorTestFPParam; class BlockErrorTestFP : public ::testing::Test, @@ -493,7 +494,7 @@ TEST_P(BlockErrorTestFP, DISABLED_Speed) { printf("blocksize: %4d time: %4d us\n", blocksize, elapsed_time); } -using ::testing::make_tuple; +using std::make_tuple; INSTANTIATE_TEST_CASE_P( C, AverageTest, diff --git a/test/blockiness_test.cc b/test/blockiness_test.cc index c6a3be1..38b4b58 100644 --- a/test/blockiness_test.cc +++ b/test/blockiness_test.cc @@ -11,6 +11,7 @@ #include #include #include +#include #include "third_party/googletest/src/include/gtest/gtest.h" @@ -141,7 +142,7 @@ class BlockinessTestBase : public ::testing::Test { }; #if CONFIG_VP9_ENCODER -typedef ::testing::tuple BlockinessParam; +typedef std::tuple BlockinessParam; class BlockinessVP9Test : public BlockinessTestBase, public ::testing::WithParamInterface { @@ -208,7 +209,7 @@ TEST_P(BlockinessVP9Test, WorstCaseBlockiness) { } #endif // CONFIG_VP9_ENCODER -using ::testing::make_tuple; +using std::make_tuple; //------------------------------------------------------------------------------ // C functions diff --git a/test/codec_factory.h b/test/codec_factory.h index 2bfb473..17c9512 100644 --- a/test/codec_factory.h +++ b/test/codec_factory.h @@ -10,6 +10,8 @@ #ifndef VPX_TEST_CODEC_FACTORY_H_ #define VPX_TEST_CODEC_FACTORY_H_ +#include + #include "./vpx_config.h" #include "vpx/vpx_decoder.h" #include "vpx/vpx_encoder.h" @@ -53,22 +55,22 @@ class CodecFactory { template class CodecTestWithParam : public ::testing::TestWithParam< - ::testing::tuple > {}; + std::tuple > {}; template class CodecTestWith2Params : public ::testing::TestWithParam< - ::testing::tuple > {}; + std::tuple > {}; template class CodecTestWith3Params : public ::testing::TestWithParam< - ::testing::tuple > {}; + std::tuple > {}; template class CodecTestWith4Params - : public ::testing::TestWithParam< ::testing::tuple< - const libvpx_test::CodecFactory *, T1, T2, T3, T4> > {}; + : public ::testing::TestWithParam< + std::tuple > {}; /* * VP8 Codec Definitions diff --git a/test/consistency_test.cc b/test/consistency_test.cc index f6660da..61e15f7 100644 --- a/test/consistency_test.cc +++ b/test/consistency_test.cc @@ -11,6 +11,7 @@ #include #include #include +#include #include "third_party/googletest/src/include/gtest/gtest.h" @@ -127,7 +128,7 @@ class ConsistencyTestBase : public ::testing::Test { }; #if CONFIG_VP9_ENCODER -typedef ::testing::tuple ConsistencyParam; +typedef std::tuple ConsistencyParam; class ConsistencyVP9Test : public ConsistencyTestBase, public ::testing::WithParamInterface { @@ -198,7 +199,7 @@ TEST_P(ConsistencyVP9Test, ConsistencyIsZero) { } #endif // CONFIG_VP9_ENCODER -using ::testing::make_tuple; +using std::make_tuple; //------------------------------------------------------------------------------ // C functions diff --git a/test/convolve_test.cc b/test/convolve_test.cc index 0b718a5..02cc7ff 100644 --- a/test/convolve_test.cc +++ b/test/convolve_test.cc @@ -9,6 +9,7 @@ */ #include +#include #include "third_party/googletest/src/include/gtest/gtest.h" @@ -77,7 +78,7 @@ struct ConvolveFunctions { int use_highbd_; // 0 if high bitdepth not used, else the actual bit depth. }; -typedef ::testing::tuple ConvolveParam; +typedef std::tuple ConvolveParam; #define ALL_SIZES(convolve_fn) \ make_tuple(4, 4, &convolve_fn), make_tuple(8, 4, &convolve_fn), \ @@ -1113,7 +1114,7 @@ TEST_P(ConvolveTest, CheckScalingFiltering) { } #endif -using ::testing::make_tuple; +using std::make_tuple; #if CONFIG_VP9_HIGHBITDEPTH #define WRAP(func, bd) \ diff --git a/test/dct16x16_test.cc b/test/dct16x16_test.cc index 8728241..9ccf2b8 100644 --- a/test/dct16x16_test.cc +++ b/test/dct16x16_test.cc @@ -11,6 +11,7 @@ #include #include #include +#include #include "third_party/googletest/src/include/gtest/gtest.h" @@ -229,11 +230,9 @@ typedef void (*FhtFunc)(const int16_t *in, tran_low_t *out, int stride, typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride, int tx_type); -typedef ::testing::tuple - Dct16x16Param; -typedef ::testing::tuple Ht16x16Param; -typedef ::testing::tuple - Idct16x16Param; +typedef std::tuple Dct16x16Param; +typedef std::tuple Ht16x16Param; +typedef std::tuple Idct16x16Param; void fdct16x16_ref(const int16_t *in, tran_low_t *out, int stride, int /*tx_type*/) { @@ -745,7 +744,7 @@ TEST_P(InvTrans16x16DCT, CompareReference) { CompareInvReference(ref_txfm_, thresh_); } -using ::testing::make_tuple; +using std::make_tuple; #if CONFIG_VP9_HIGHBITDEPTH INSTANTIATE_TEST_CASE_P( diff --git a/test/dct32x32_test.cc b/test/dct32x32_test.cc index dd902f5..94d6b37 100644 --- a/test/dct32x32_test.cc +++ b/test/dct32x32_test.cc @@ -11,6 +11,7 @@ #include #include #include +#include #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 +typedef std::tuple 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( diff --git a/test/dct_partial_test.cc b/test/dct_partial_test.cc index dd040d5..c889e92 100644 --- a/test/dct_partial_test.cc +++ b/test/dct_partial_test.cc @@ -11,8 +11,8 @@ #include #include #include - #include +#include #include "third_party/googletest/src/include/gtest/gtest.h" @@ -28,8 +28,8 @@ using libvpx_test::ACMRandom; using libvpx_test::Buffer; -using ::testing::make_tuple; -using ::testing::tuple; +using std::make_tuple; +using std::tuple; namespace { typedef void (*PartialFdctFunc)(const int16_t *in, tran_low_t *out, int stride); diff --git a/test/dct_test.cc b/test/dct_test.cc index 5b5ce40..6053aee 100644 --- a/test/dct_test.cc +++ b/test/dct_test.cc @@ -11,6 +11,7 @@ #include #include #include +#include #include "third_party/googletest/src/include/gtest/gtest.h" @@ -28,8 +29,8 @@ using libvpx_test::ACMRandom; using libvpx_test::Buffer; -using ::testing::make_tuple; -using ::testing::tuple; +using std::make_tuple; +using std::tuple; namespace { typedef void (*FdctFunc)(const int16_t *in, tran_low_t *out, int stride); diff --git a/test/decode_corrupted.cc b/test/decode_corrupted.cc index b44c378..b1495ce 100644 --- a/test/decode_corrupted.cc +++ b/test/decode_corrupted.cc @@ -8,6 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include + #include "third_party/googletest/src/include/gtest/gtest.h" #include "test/codec_factory.h" @@ -21,7 +23,7 @@ namespace { class DecodeCorruptedFrameTest : public ::libvpx_test::EncoderTest, public ::testing::TestWithParam< - ::testing::tuple > { + std::tuple > { public: DecodeCorruptedFrameTest() : EncoderTest(GET_PARAM(0)) {} diff --git a/test/decode_perf_test.cc b/test/decode_perf_test.cc index fed09de..aecdd3e 100644 --- a/test/decode_perf_test.cc +++ b/test/decode_perf_test.cc @@ -9,6 +9,8 @@ */ #include +#include + #include "test/codec_factory.h" #include "test/decode_test_driver.h" #include "test/encode_test_driver.h" @@ -21,7 +23,7 @@ #include "./ivfenc.h" #include "./vpx_version.h" -using ::testing::make_tuple; +using std::make_tuple; namespace { @@ -34,7 +36,7 @@ const char kNewEncodeOutputFile[] = "new_encode.ivf"; /* DecodePerfTest takes a tuple of filename + number of threads to decode with */ -typedef ::testing::tuple DecodePerfParam; +typedef std::tuple DecodePerfParam; const DecodePerfParam kVP9DecodePerfVectors[] = { make_tuple("vp90-2-bbb_426x240_tile_1x1_180kbps.webm", 1), diff --git a/test/fdct8x8_test.cc b/test/fdct8x8_test.cc index a86d9e3..244b974 100644 --- a/test/fdct8x8_test.cc +++ b/test/fdct8x8_test.cc @@ -11,6 +11,7 @@ #include #include #include +#include #include "third_party/googletest/src/include/gtest/gtest.h" @@ -43,9 +44,9 @@ typedef void (*FhtFunc)(const int16_t *in, tran_low_t *out, int stride, typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride, int tx_type); -typedef ::testing::tuple Dct8x8Param; -typedef ::testing::tuple Ht8x8Param; -typedef ::testing::tuple Idct8x8Param; +typedef std::tuple Dct8x8Param; +typedef std::tuple Ht8x8Param; +typedef std::tuple Idct8x8Param; void reference_8x8_dct_1d(const double in[8], double out[8]) { const double kInvSqrt2 = 0.707106781186547524400844362104; @@ -628,7 +629,7 @@ TEST_P(InvTrans8x8DCT, CompareReference) { CompareInvReference(ref_txfm_, thresh_); } -using ::testing::make_tuple; +using std::make_tuple; #if CONFIG_VP9_HIGHBITDEPTH INSTANTIATE_TEST_CASE_P( diff --git a/test/lpf_test.cc b/test/lpf_test.cc index 1977623..dfdd515 100644 --- a/test/lpf_test.cc +++ b/test/lpf_test.cc @@ -11,6 +11,7 @@ #include #include #include +#include #include "third_party/googletest/src/include/gtest/gtest.h" @@ -56,8 +57,8 @@ typedef void (*dual_loop_op_t)(Pixel *s, int p, const uint8_t *blimit0, const uint8_t *thresh1); #endif // CONFIG_VP9_HIGHBITDEPTH -typedef ::testing::tuple loop8_param_t; -typedef ::testing::tuple dualloop8_param_t; +typedef std::tuple loop8_param_t; +typedef std::tuple dualloop8_param_t; void InitInput(Pixel *s, Pixel *ref_s, ACMRandom *rnd, const uint8_t limit, const int mask, const int32_t p, const int i) { @@ -402,7 +403,7 @@ TEST_P(Loop8Test9Param, ValueCheck) { << "First failed at test case " << first_failure; } -using ::testing::make_tuple; +using std::make_tuple; #if HAVE_SSE2 #if CONFIG_VP9_HIGHBITDEPTH diff --git a/test/partial_idct_test.cc b/test/partial_idct_test.cc index 6fd4061..e66a695 100644 --- a/test/partial_idct_test.cc +++ b/test/partial_idct_test.cc @@ -11,8 +11,8 @@ #include #include #include - #include +#include #include "third_party/googletest/src/include/gtest/gtest.h" @@ -51,8 +51,8 @@ void highbd_wrapper(const tran_low_t *in, uint8_t *out, int stride, int bd) { } #endif -typedef ::testing::tuple +typedef std::tuple PartialInvTxfmParam; const int kMaxNumCoeffs = 1024; const int kCountTestBlock = 1000; @@ -324,7 +324,7 @@ TEST_P(PartialIDctTest, DISABLED_Speed) { << "Error: partial inverse transform produces different results"; } -using ::testing::make_tuple; +using std::make_tuple; const PartialInvTxfmParam c_partial_idct_tests[] = { #if CONFIG_VP9_HIGHBITDEPTH diff --git a/test/predict_test.cc b/test/predict_test.cc index 6420794..d40d9c7 100644 --- a/test/predict_test.cc +++ b/test/predict_test.cc @@ -10,6 +10,7 @@ #include #include +#include #include "third_party/googletest/src/include/gtest/gtest.h" @@ -27,13 +28,13 @@ namespace { using libvpx_test::ACMRandom; -using ::testing::make_tuple; +using std::make_tuple; typedef void (*PredictFunc)(uint8_t *src_ptr, int src_pixels_per_line, int xoffset, int yoffset, uint8_t *dst_ptr, int dst_pitch); -typedef ::testing::tuple PredictParam; +typedef std::tuple PredictParam; class PredictTestBase : public AbstractBench, public ::testing::TestWithParam { diff --git a/test/quantize_test.cc b/test/quantize_test.cc index e06241a..1415ce1 100644 --- a/test/quantize_test.cc +++ b/test/quantize_test.cc @@ -9,6 +9,7 @@ */ #include +#include #include "third_party/googletest/src/include/gtest/gtest.h" @@ -33,10 +34,10 @@ const int kNumBlockEntries = 16; typedef void (*VP8Quantize)(BLOCK *b, BLOCKD *d); -typedef ::testing::tuple VP8QuantizeParam; +typedef std::tuple VP8QuantizeParam; using libvpx_test::ACMRandom; -using ::testing::make_tuple; +using std::make_tuple; // Create and populate a VP8_COMP instance which has a complete set of // quantization inputs as well as a second MACROBLOCKD for output. diff --git a/test/sum_squares_test.cc b/test/sum_squares_test.cc index e211fb4..d2c70f4 100644 --- a/test/sum_squares_test.cc +++ b/test/sum_squares_test.cc @@ -11,6 +11,7 @@ #include #include #include +#include #include "third_party/googletest/src/include/gtest/gtest.h" @@ -28,7 +29,7 @@ namespace { const int kNumIterations = 10000; typedef uint64_t (*SSI16Func)(const int16_t *src, int stride, int size); -typedef ::testing::tuple SumSquaresParam; +typedef std::tuple SumSquaresParam; class SumSquaresTest : public ::testing::TestWithParam { public: @@ -102,7 +103,7 @@ TEST_P(SumSquaresTest, ExtremeValues) { } } -using ::testing::make_tuple; +using std::make_tuple; #if HAVE_NEON INSTANTIATE_TEST_CASE_P( diff --git a/test/superframe_test.cc b/test/superframe_test.cc index d913871..8c8d1ae 100644 --- a/test/superframe_test.cc +++ b/test/superframe_test.cc @@ -8,6 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ #include +#include + #include "third_party/googletest/src/include/gtest/gtest.h" #include "test/codec_factory.h" #include "test/encode_test_driver.h" @@ -18,7 +20,7 @@ namespace { const int kTestMode = 0; -typedef ::testing::tuple SuperframeTestParam; +typedef std::tuple SuperframeTestParam; class SuperframeTest : public ::libvpx_test::EncoderTest, @@ -31,7 +33,7 @@ class SuperframeTest virtual void SetUp() { InitializeConfig(); const SuperframeTestParam input = GET_PARAM(1); - const libvpx_test::TestMode mode = ::testing::get(input); + const libvpx_test::TestMode mode = std::get(input); SetMode(mode); sf_count_ = 0; sf_count_max_ = INT_MAX; diff --git a/test/test_vector_test.cc b/test/test_vector_test.cc index c4a6359..f3e585d 100644 --- a/test/test_vector_test.cc +++ b/test/test_vector_test.cc @@ -13,6 +13,8 @@ #include #include #include +#include + #include "third_party/googletest/src/include/gtest/gtest.h" #include "../tools_common.h" #include "./vpx_config.h" @@ -32,7 +34,7 @@ namespace { const int kThreads = 0; const int kFileName = 1; -typedef ::testing::tuple DecodeParam; +typedef std::tuple DecodeParam; class TestVectorTest : public ::libvpx_test::DecoderTest, public ::libvpx_test::CodecTestWithParam { @@ -89,12 +91,12 @@ class TestVectorTest : public ::libvpx_test::DecoderTest, // the test failed. TEST_P(TestVectorTest, MD5Match) { const DecodeParam input = GET_PARAM(1); - const std::string filename = ::testing::get(input); + const std::string filename = std::get(input); vpx_codec_flags_t flags = 0; vpx_codec_dec_cfg_t cfg = vpx_codec_dec_cfg_t(); char str[256]; - cfg.threads = ::testing::get(input); + cfg.threads = std::get(input); snprintf(str, sizeof(str) / sizeof(str[0]) - 1, "file: %s threads: %d", filename.c_str(), cfg.threads); diff --git a/test/util.h b/test/util.h index 4392188..985f487 100644 --- a/test/util.h +++ b/test/util.h @@ -13,11 +13,13 @@ #include #include +#include + #include "third_party/googletest/src/include/gtest/gtest.h" #include "vpx/vpx_image.h" // Macros -#define GET_PARAM(k) ::testing::get(GetParam()) +#define GET_PARAM(k) std::get(GetParam()) inline double compute_psnr(const vpx_image_t *img1, const vpx_image_t *img2) { assert((img1->fmt == img2->fmt) && (img1->d_w == img2->d_w) && diff --git a/test/vp9_block_error_test.cc b/test/vp9_block_error_test.cc index fa9b6a6..71a0686 100644 --- a/test/vp9_block_error_test.cc +++ b/test/vp9_block_error_test.cc @@ -11,6 +11,7 @@ #include #include #include +#include #include "third_party/googletest/src/include/gtest/gtest.h" @@ -35,7 +36,7 @@ typedef int64_t (*HBDBlockErrorFunc)(const tran_low_t *coeff, intptr_t block_size, int64_t *ssz, int bps); -typedef ::testing::tuple +typedef std::tuple BlockErrorParam; typedef int64_t (*BlockErrorFunc)(const tran_low_t *coeff, @@ -168,7 +169,7 @@ TEST_P(BlockErrorTest, ExtremeValues) { << "First failed at test case " << first_failure; } -using ::testing::make_tuple; +using std::make_tuple; #if HAVE_SSE2 const BlockErrorParam sse2_block_error_tests[] = { diff --git a/test/vp9_denoiser_test.cc b/test/vp9_denoiser_test.cc index e3a057b..47fa587 100644 --- a/test/vp9_denoiser_test.cc +++ b/test/vp9_denoiser_test.cc @@ -11,6 +11,7 @@ #include #include #include +#include #include "third_party/googletest/src/include/gtest/gtest.h" #include "test/acm_random.h" @@ -35,8 +36,7 @@ typedef int (*Vp9DenoiserFilterFunc)(const uint8_t *sig, int sig_stride, uint8_t *avg, int avg_stride, int increase_denoising, BLOCK_SIZE bs, int motion_magnitude); -typedef ::testing::tuple - VP9DenoiserTestParam; +typedef std::tuple VP9DenoiserTestParam; class VP9DenoiserTest : public ::testing::Test, @@ -100,7 +100,7 @@ TEST_P(VP9DenoiserTest, BitexactCheck) { } } -using ::testing::make_tuple; +using std::make_tuple; // Test for all block size. #if HAVE_SSE2 diff --git a/test/vp9_quantize_test.cc b/test/vp9_quantize_test.cc index 280d558..cce6b6f 100644 --- a/test/vp9_quantize_test.cc +++ b/test/vp9_quantize_test.cc @@ -11,6 +11,7 @@ #include #include #include +#include #include "third_party/googletest/src/include/gtest/gtest.h" @@ -43,8 +44,8 @@ typedef void (*QuantizeFunc)(const tran_low_t *coeff, intptr_t count, tran_low_t *dqcoeff, const int16_t *dequant, uint16_t *eob, const int16_t *scan, const int16_t *iscan); -typedef ::testing::tuple +typedef std::tuple QuantizeParam; // Wrapper for FP version which does not use zbin or quant_shift. @@ -462,7 +463,7 @@ TEST_P(VP9QuantizeTest, DISABLED_Speed) { } } -using ::testing::make_tuple; +using std::make_tuple; #if HAVE_SSE2 #if CONFIG_VP9_HIGHBITDEPTH -- 2.7.4