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

Merge pull request #20961 from alalek:fix_msvc_clang

Browse Source
This commit is contained in:
Alexander Alekhin 2021-10-28 13:54:23 +00:00
commit 6bd143dd25
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/include/opencv2/core/hal/intrin_sse.hpp
View File

@ -244,7 +244,7 @@ struct v_uint64x2
explicit v_uint64x2(__m128i v) : val(v) {} explicit v_uint64x2(__m128i v) : val(v) {}
v_uint64x2(uint64 v0, uint64 v1) v_uint64x2(uint64 v0, uint64 v1)
{ {
#if defined(_MSC_VER) && _MSC_VER >= 1920/*MSVS 2019*/ && defined(_M_X64) #if defined(_MSC_VER) && _MSC_VER >= 1920/*MSVS 2019*/ && defined(_M_X64) && !defined(__clang__)
val = _mm_setr_epi64x((int64_t)v0, (int64_t)v1); val = _mm_setr_epi64x((int64_t)v0, (int64_t)v1);
#elif defined(__GNUC__) #elif defined(__GNUC__)
val = _mm_setr_epi64((__m64)v0, (__m64)v1); val = _mm_setr_epi64((__m64)v0, (__m64)v1);
@ -278,7 +278,7 @@ struct v_int64x2
explicit v_int64x2(__m128i v) : val(v) {} explicit v_int64x2(__m128i v) : val(v) {}
v_int64x2(int64 v0, int64 v1) v_int64x2(int64 v0, int64 v1)
{ {
#if defined(_MSC_VER) && _MSC_VER >= 1920/*MSVS 2019*/ && defined(_M_X64) #if defined(_MSC_VER) && _MSC_VER >= 1920/*MSVS 2019*/ && defined(_M_X64) && !defined(__clang__)
val = _mm_setr_epi64x((int64_t)v0, (int64_t)v1); val = _mm_setr_epi64x((int64_t)v0, (int64_t)v1);
#elif defined(__GNUC__) #elif defined(__GNUC__)
val = _mm_setr_epi64((__m64)v0, (__m64)v1); val = _mm_setr_epi64((__m64)v0, (__m64)v1);