diff options
| author | James Zern <jzern@google.com> | 2018-03-29 19:01:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-29 19:01:34 +0000 |
| commit | d636fe53af525c30f3bbd7224e7e56d447d0eb3d (patch) | |
| tree | 669d7b6d1cf073004eb89cd1a22d068b339cf292 /test/convolve_test.cc | |
| parent | 81e78a1d5fd1229be32049948078ca94ea048f5d (diff) | |
| parent | db49a22cfa618479b963d40e7ef7c48a6bc4a97e (diff) | |
| download | libvpx-d636fe53af525c30f3bbd7224e7e56d447d0eb3d.tar libvpx-d636fe53af525c30f3bbd7224e7e56d447d0eb3d.tar.gz libvpx-d636fe53af525c30f3bbd7224e7e56d447d0eb3d.tar.bz2 libvpx-d636fe53af525c30f3bbd7224e7e56d447d0eb3d.zip | |
Merge "test: use testing::*tuple instead of std::tr1"
Diffstat (limited to 'test/convolve_test.cc')
| -rw-r--r-- | test/convolve_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/convolve_test.cc b/test/convolve_test.cc index aa49d99f8..3e9377a0e 100644 --- a/test/convolve_test.cc +++ b/test/convolve_test.cc @@ -77,7 +77,7 @@ struct ConvolveFunctions { int use_highbd_; // 0 if high bitdepth not used, else the actual bit depth. }; -typedef std::tr1::tuple<int, int, const ConvolveFunctions *> ConvolveParam; +typedef ::testing::tuple<int, int, const ConvolveFunctions *> ConvolveParam; #define ALL_SIZES(convolve_fn) \ make_tuple(4, 4, &convolve_fn), make_tuple(8, 4, &convolve_fn), \ @@ -1042,7 +1042,7 @@ TEST_P(ConvolveTest, CheckScalingFiltering) { } #endif -using std::tr1::make_tuple; +using ::testing::make_tuple; #if CONFIG_VP9_HIGHBITDEPTH #define WRAP(func, bd) \ |