mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

hotfix: repair Clang ABI

Browse Source
This commit is contained in:
Alexander Alekhin 2021-10-21 09:36:25 +00:00
parent 4223495e6c
commit bac1c6d12f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/core/include/opencv2/core/types.hpp
View File

@ -162,7 +162,7 @@ public:
//! default constructor //! default constructor
Point_(); Point_();
Point_(_Tp _x, _Tp _y); 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_(const Point_& pt);
Point_(Point_&& pt) CV_NOEXCEPT = default; Point_(Point_&& pt) CV_NOEXCEPT = default;
#elif OPENCV_ABI_COMPATIBILITY < 500 #elif OPENCV_ABI_COMPATIBILITY < 500
@ -172,7 +172,7 @@ public:
Point_(const Size_<_Tp>& sz); Point_(const Size_<_Tp>& sz);
Point_(const Vec<_Tp, 2>& v); 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 = (const Point_& pt);
Point_& operator = (Point_&& pt) CV_NOEXCEPT = default; Point_& operator = (Point_&& pt) CV_NOEXCEPT = default;
#elif OPENCV_ABI_COMPATIBILITY < 500 #elif OPENCV_ABI_COMPATIBILITY < 500
@ -1186,7 +1186,7 @@ template<typename _Tp> inline
Point_<_Tp>::Point_(_Tp _x, _Tp _y) Point_<_Tp>::Point_(_Tp _x, _Tp _y)
: x(_x), y(_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<typename _Tp> inline template<typename _Tp> inline
Point_<_Tp>::Point_(const Point_& pt) Point_<_Tp>::Point_(const Point_& pt)
: x(pt.x), y(pt.y) {} : x(pt.x), y(pt.y) {}
@ -1200,7 +1200,7 @@ template<typename _Tp> inline
Point_<_Tp>::Point_(const Vec<_Tp,2>& v) Point_<_Tp>::Point_(const Vec<_Tp,2>& v)
: x(v[0]), y(v[1]) {} : 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<typename _Tp> inline template<typename _Tp> inline
Point_<_Tp>& Point_<_Tp>::operator = (const Point_& pt) Point_<_Tp>& Point_<_Tp>::operator = (const Point_& pt)
{ {