Merge remote-tracking branch 'upstream/3.4' into merge-3.4

This commit is contained in:
Alexander Alekhin
2019-08-13 18:37:01 +03:00
committed by Alexander Alekhin
28 changed files with 450 additions and 576 deletions
+1 -8
View File
@@ -160,14 +160,7 @@ TEST(Core_Ptr, assignment)
{
Ptr<Reporter> p1(new Reporter(&deleted1));
#if defined(__clang__) && (__clang_major__ >= 9) && !defined(__APPLE__)
CV_DO_PRAGMA(GCC diagnostic push)
CV_DO_PRAGMA(GCC diagnostic ignored "-Wself-assign-overloaded")
#endif
p1 = p1;
#if defined(__clang__) && (__clang_major__ >= 9) && !defined(__APPLE__)
CV_DO_PRAGMA(GCC diagnostic pop)
#endif
p1 = *&p1;
EXPECT_FALSE(deleted1);
}