1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build with g++ 10.2

Browse Source 
g++ 10.2 complains here that a comparison of "Last" with
"std::numeric_limits<quint8>::max()" is always false when "Last" is
an int greater than 256. This is because
"std::numeric_limits<quint8>::max() returns an quint8. Since parts of
Qt are built with -Werror, the build fails.
Fixed by adding a unary plus (+).

Change-Id: I16a6b9f6952aeddf0a2a04d87746e433927122bf
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Andreas Buhr 2020-10-03 11:01:49 +02:00
parent 97de53ee8c
commit 3c4e94d12c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/tools/qoffsetstringarray_p.h
View File

@ -65,9 +65,11 @@ struct OffsetSequenceHelper : OffsetSequenceHelper<N - 1, O + I, Idx..., O> { };
template<int Last, int I, int S, int ... Idx>
struct OffsetSequenceHelper<1, Last, I, S, Idx...> : IndexesList<Last + I, Idx..., Last>
{
// the unary + before std::numeric_limits below is required. Otherwise we get on g++-10.2:
// error: comparison is always false due to limited range of data type [-Werror=type-limits]
static const constexpr auto Length = Last + I;
using Type = typename std::conditional<
Last <= std::numeric_limits<quint8>::max(),
Last <= +std::numeric_limits<quint8>::max(),
quint8,
typename std::conditional<
Last <= std::numeric_limits<quint16>::max(),