diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2018-06-15 12:07:13 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2018-06-16 01:19:52 +0000 |
| commit | 15553d3ea7b994680b0dfea8973aa4b1900aecad (patch) | |
| tree | b9dfd3e6046bd998de410834e2915a6765aeeda7 /src/corelib | |
| parent | 4bf45691b507a5905c8aae6f933f5a533b325d58 (diff) | |
Fix build with SSE 4.1 but not AVX2
Failed on my Sandybridge Mac with -march=native:
qstring.cpp:363:19: error: redefinition of 'mask' with a different type: 'const __m128i'
Change-Id: I6efb28c3145047559ec0fffd15386aeb8d36d681
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index df95938c41..712e058c9c 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -294,7 +294,7 @@ static bool simdTestMask(const char *&ptr, const char *end, quint32 maskval) # else // SSE 4.1 implementation: test 32 bytes at a time (two 16-byte // comparisons, unrolled) - const __m128i mask = _mm_set1_epi32(maskval); + mask = _mm_set1_epi32(maskval); while (ptr + 32 <= end) { __m128i data1 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(ptr)); __m128i data2 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(ptr + 16)); |