Merge pull request #5212 from thebucc:master

modules/core/perf/opencl/perf_channels.cpp

@@ -156,6 +156,9 @@ OCL_PERF_TEST_P(MixChannelsFixture, MixChannels,
 
 ///////////// InsertChannel ////////////////////////
 
+typedef std::tr1::tuple<cv::Size, MatDepth> Size_MatDepth_t;
+typedef TestBaseWithParam<Size_MatDepth_t> Size_MatDepth;
+
 typedef Size_MatDepth InsertChannelFixture;
 
 OCL_PERF_TEST_P(InsertChannelFixture, InsertChannel,

modules/ts/include/opencv2/ts/ts_perf.hpp

@@ -477,9 +477,6 @@ template<typename T> class TestBaseWithParam: public TestBase, public ::testing:
 typedef std::tr1::tuple<cv::Size, MatType> Size_MatType_t;
 typedef TestBaseWithParam<Size_MatType_t> Size_MatType;
 
-typedef std::tr1::tuple<cv::Size, MatDepth> Size_MatDepth_t;
-typedef TestBaseWithParam<Size_MatDepth_t> Size_MatDepth;
-
 /*****************************************************************************************\
 *                              Print functions for googletest                             *
 \*****************************************************************************************/