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/convolve_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/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 3f0367110..9739eed23 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) \ |