diff options
| author | Tom Finegan <tomfinegan@google.com> | 2014-03-20 15:17:48 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-03-20 15:17:48 -0700 |
| commit | 8e9c9f118cda45013f14cce7961dcc8df78ffebf (patch) | |
| tree | 277fc061ba508f2a16193185d42ff86c276399bf /test | |
| parent | 03d75182f7d345b54ceec3ac32df887af8a02d82 (diff) | |
| parent | 9d7080e9f6bba3e840a98e5d9b73c538e30b5f05 (diff) | |
| download | libvpx-8e9c9f118cda45013f14cce7961dcc8df78ffebf.tar libvpx-8e9c9f118cda45013f14cce7961dcc8df78ffebf.tar.gz libvpx-8e9c9f118cda45013f14cce7961dcc8df78ffebf.tar.bz2 libvpx-8e9c9f118cda45013f14cce7961dcc8df78ffebf.zip | |
Merge "intrapred_test: fix inheritance"
Diffstat (limited to 'test')
| -rw-r--r-- | test/intrapred_test.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/test/intrapred_test.cc b/test/intrapred_test.cc index b28f5fbe6..cefe192fb 100644 --- a/test/intrapred_test.cc +++ b/test/intrapred_test.cc @@ -26,11 +26,7 @@ using libvpx_test::ACMRandom; class IntraPredBase { public: - virtual ~IntraPredBase() {} - - virtual void TearDown() { - libvpx_test::ClearSystemState(); - } + virtual ~IntraPredBase() { libvpx_test::ClearSystemState(); } protected: void SetupMacroblock(MACROBLOCKD *mbptr, @@ -227,8 +223,9 @@ typedef void (*intra_pred_y_fn_t)(MACROBLOCKD *x, uint8_t *ypred_ptr, int y_stride); -class IntraPredYTest : public ::testing::TestWithParam<intra_pred_y_fn_t>, - protected IntraPredBase { +class IntraPredYTest + : public IntraPredBase, + public ::testing::TestWithParam<intra_pred_y_fn_t> { public: static void SetUpTestCase() { mb_ = reinterpret_cast<MACROBLOCKD*>( @@ -308,8 +305,9 @@ typedef void (*intra_pred_uv_fn_t)(MACROBLOCKD *x, uint8_t *vpred_ptr, int pred_stride); -class IntraPredUVTest : public ::testing::TestWithParam<intra_pred_uv_fn_t>, - protected IntraPredBase { +class IntraPredUVTest + : public IntraPredBase, + public ::testing::TestWithParam<intra_pred_uv_fn_t> { public: static void SetUpTestCase() { mb_ = reinterpret_cast<MACROBLOCKD*>( |