diff options
| author | Mikhail Svetkin <mikhail.svetkin@qt.io> | 2018-08-28 16:41:28 +0200 |
|---|---|---|
| committer | Mikhail Svetkin <mikhail.svetkin@qt.io> | 2018-09-05 14:11:15 +0000 |
| commit | 40cd0f35ef0b27b1451caf393a97b8a4ac8cd4b2 (patch) | |
| tree | de2890a104f93803f9713e6e0ca9017f0d0110bb /src/corelib/tools/qoffsetstringarray_p.h | |
| parent | dd944136a253ba40def26046729e5020b179692a (diff) | |
Remove QConditional in favor of std::conditional/std::is_unsigned
Change-Id: I5e0b9f640eb49aa7f5afdd4f3f15e027659e78ea
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/tools/qoffsetstringarray_p.h')
| -rw-r--r-- | src/corelib/tools/qoffsetstringarray_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h index ff195965ec..0a7906a3c5 100644 --- a/src/corelib/tools/qoffsetstringarray_p.h +++ b/src/corelib/tools/qoffsetstringarray_p.h @@ -66,14 +66,14 @@ template<int Last, int I, int S, int ... Idx> struct OffsetSequenceHelper<1, Last, I, S, Idx...> : IndexesList<Last + I, Idx..., Last> { static const constexpr auto Length = Last + I; - using Type = typename QConditional< + using Type = typename std::conditional< Last <= std::numeric_limits<quint8>::max(), quint8, - typename QConditional< + typename std::conditional< Last <= std::numeric_limits<quint16>::max(), quint16, - int>::Type - >::Type; + int>::type + >::type; }; template<int ... Idx> |