mirror of
https://github.com/opencv/opencv.git
synced 2026-07-30 07:43:03 +04:00
next: drop CV_CXX11 conditions
define itself is still here for compatibility
This commit is contained in:
@@ -1344,8 +1344,6 @@ TEST(Core_Matx, fromMat_)
|
||||
ASSERT_EQ( cvtest::norm(a, b, NORM_INF), 0.);
|
||||
}
|
||||
|
||||
#ifdef CV_CXX11
|
||||
|
||||
TEST(Core_Matx, from_initializer_list)
|
||||
{
|
||||
Mat_<double> a = (Mat_<double>(2,2) << 10, 11, 12, 13);
|
||||
@@ -1360,8 +1358,6 @@ TEST(Core_Mat, regression_9507)
|
||||
EXPECT_EQ(25u, m2.total());
|
||||
}
|
||||
|
||||
#endif // CXX11
|
||||
|
||||
TEST(Core_InputArray, empty)
|
||||
{
|
||||
vector<vector<Point> > data;
|
||||
@@ -1711,8 +1707,6 @@ TEST(Mat, regression_8680)
|
||||
ASSERT_EQ(mat.channels(), 2);
|
||||
}
|
||||
|
||||
#ifdef CV_CXX11
|
||||
|
||||
TEST(Mat_, range_based_for)
|
||||
{
|
||||
Mat_<uchar> img = Mat_<uchar>::zeros(3, 3);
|
||||
@@ -1774,6 +1768,4 @@ TEST(Mat_, template_based_ptr)
|
||||
ASSERT_FLOAT_EQ(66.0f, *(mat.ptr<float>(idx)));
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
}} // namespace
|
||||
|
||||
Reference in New Issue
Block a user