From eb8782cb2ea765080945a775a806b377b5943833 Mon Sep 17 00:00:00 2001 From: Hamish Moffatt Date: Fri, 24 Mar 2023 11:11:12 +1100 Subject: [PATCH] QtConcurrent: fix warning due to assignment to narrower integer type MSVC warns due to assignment of std::distance's return value (__int64) to int when warning C4244 is enabled. Pick-to: 6.5 Change-Id: I78360ec1bbe861b96d6875af3a29b77f419a3843 Reviewed-by: Thiago Macieira Reviewed-by: Marc Mutz --- src/concurrent/qtconcurrentiteratekernel.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/concurrent/qtconcurrentiteratekernel.h b/src/concurrent/qtconcurrentiteratekernel.h index a23fe37a3c..e9a5a17e01 100644 --- a/src/concurrent/qtconcurrentiteratekernel.h +++ b/src/concurrent/qtconcurrentiteratekernel.h @@ -156,7 +156,7 @@ public: begin(_begin), end(_end), current(_begin), - iterationCount(selectIteration(IteratorCategory()) ? std::distance(_begin, _end) : 0), + iterationCount(selectIteration(IteratorCategory()) ? static_cast(std::distance(_begin, _end)) : 0), forIteration(selectIteration(IteratorCategory())), progressReportingEnabled(true) { @@ -168,7 +168,7 @@ public: begin(_begin), end(_end), current(_begin), - iterationCount(selectIteration(IteratorCategory()) ? std::distance(_begin, _end) : 0), + iterationCount(selectIteration(IteratorCategory()) ? static_cast(std::distance(_begin, _end)) : 0), forIteration(selectIteration(IteratorCategory())), progressReportingEnabled(true), defaultValue(U()) @@ -181,7 +181,7 @@ public: begin(_begin), end(_end), current(_begin), - iterationCount(selectIteration(IteratorCategory()) ? std::distance(_begin, _end) : 0), + iterationCount(selectIteration(IteratorCategory()) ? static_cast(std::distance(_begin, _end)) : 0), forIteration(selectIteration(IteratorCategory())), progressReportingEnabled(true), defaultValue(std::forward(_defaultValue))