diff --git a/modules/core/perf/opencl/perf_channels.cpp b/modules/core/perf/opencl/perf_channels.cpp index 62d6b822b..881e79afc 100644 --- a/modules/core/perf/opencl/perf_channels.cpp +++ b/modules/core/perf/opencl/perf_channels.cpp @@ -156,6 +156,9 @@ OCL_PERF_TEST_P(MixChannelsFixture, MixChannels, ///////////// InsertChannel //////////////////////// +typedef std::tr1::tuple Size_MatDepth_t; +typedef TestBaseWithParam Size_MatDepth; + typedef Size_MatDepth InsertChannelFixture; OCL_PERF_TEST_P(InsertChannelFixture, InsertChannel, diff --git a/modules/ts/include/opencv2/ts/ts_perf.hpp b/modules/ts/include/opencv2/ts/ts_perf.hpp index aac8ae502..703aed013 100644 --- a/modules/ts/include/opencv2/ts/ts_perf.hpp +++ b/modules/ts/include/opencv2/ts/ts_perf.hpp @@ -477,9 +477,6 @@ template class TestBaseWithParam: public TestBase, public ::testing: typedef std::tr1::tuple Size_MatType_t; typedef TestBaseWithParam Size_MatType; -typedef std::tr1::tuple Size_MatDepth_t; -typedef TestBaseWithParam Size_MatDepth; - /*****************************************************************************************\ * Print functions for googletest * \*****************************************************************************************/