From bac1c6d12f7dde6617050c6cc6567729299b1425 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Thu, 21 Oct 2021 09:36:25 +0000 Subject: [PATCH] hotfix: repair Clang ABI --- modules/core/include/opencv2/core/types.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/core/include/opencv2/core/types.hpp b/modules/core/include/opencv2/core/types.hpp index 1e9a8b629c..7dfadb2522 100644 --- a/modules/core/include/opencv2/core/types.hpp +++ b/modules/core/include/opencv2/core/types.hpp @@ -162,7 +162,7 @@ public: //! default constructor Point_(); Point_(_Tp _x, _Tp _y); -#if (defined(__GNUC__) && __GNUC__ < 5) // GCC 4.x bug. Details: https://github.com/opencv/opencv/pull/20837 +#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__) // GCC 4.x bug. Details: https://github.com/opencv/opencv/pull/20837 Point_(const Point_& pt); Point_(Point_&& pt) CV_NOEXCEPT = default; #elif OPENCV_ABI_COMPATIBILITY < 500 @@ -172,7 +172,7 @@ public: Point_(const Size_<_Tp>& sz); Point_(const Vec<_Tp, 2>& v); -#if (defined(__GNUC__) && __GNUC__ < 5) // GCC 4.x bug. Details: https://github.com/opencv/opencv/pull/20837 +#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__) // GCC 4.x bug. Details: https://github.com/opencv/opencv/pull/20837 Point_& operator = (const Point_& pt); Point_& operator = (Point_&& pt) CV_NOEXCEPT = default; #elif OPENCV_ABI_COMPATIBILITY < 500 @@ -1186,7 +1186,7 @@ template inline Point_<_Tp>::Point_(_Tp _x, _Tp _y) : x(_x), y(_y) {} -#if (defined(__GNUC__) && __GNUC__ < 5) // GCC 4.x bug. Details: https://github.com/opencv/opencv/pull/20837 +#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__) // GCC 4.x bug. Details: https://github.com/opencv/opencv/pull/20837 template inline Point_<_Tp>::Point_(const Point_& pt) : x(pt.x), y(pt.y) {} @@ -1200,7 +1200,7 @@ template inline Point_<_Tp>::Point_(const Vec<_Tp,2>& v) : x(v[0]), y(v[1]) {} -#if (defined(__GNUC__) && __GNUC__ < 5) // GCC 4.x bug. Details: https://github.com/opencv/opencv/pull/20837 +#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__) // GCC 4.x bug. Details: https://github.com/opencv/opencv/pull/20837 template inline Point_<_Tp>& Point_<_Tp>::operator = (const Point_& pt) {