diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2025-01-09 14:02:38 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2025-01-13 17:56:27 +0100 |
| commit | 2578d72a7cb9b784a00efb04df6a31496d92dcdc (patch) | |
| tree | f62c8f406bd714115399b41d2edbb9f81c7e94c2 /src | |
| parent | b562c36a9a7be5f62a8e79b93c9728381775f460 (diff) | |
Remove constexpr from a function that doesn't need it, and asserts
The call to q_assert() isn't constexpr, so can't happen in a constexpr
function. Most compilers shrug this off as they can see the code
actually is unreachable, but apparently debug builds on QNX can't work
that out. Since nothing actually needs the function to be constexpr,
remove that qualifier. In the process, move the offset-case, which is
also unreachable, to the end of the switch, closer to the unreachable
end of the function (since I failed to spot that there were two
unreachable parts at first).
Pick-to: 6.9 6.8
Fixes: QTBUG-132698
Change-Id: Ibdde7abd91d284e1c1af53e2b5e142fc234400a8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/time/qtimezonelocale.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/time/qtimezonelocale.cpp b/src/corelib/time/qtimezonelocale.cpp index 1396651a7fa..21002373d7a 100644 --- a/src/corelib/time/qtimezonelocale.cpp +++ b/src/corelib/time/qtimezonelocale.cpp @@ -39,19 +39,19 @@ using namespace Qt::StringLiterals; namespace { // Convert TimeType and NameType into ICU UCalendarDisplayNameType -constexpr UCalendarDisplayNameType ucalDisplayNameType(QTimeZone::TimeType timeType, - QTimeZone::NameType nameType) +UCalendarDisplayNameType ucalDisplayNameType(QTimeZone::TimeType timeType, + QTimeZone::NameType nameType) { // TODO ICU C UCalendarDisplayNameType does not support full set of C++ TimeZone::EDisplayType // For now, treat Generic as Standard switch (nameType) { - case QTimeZone::OffsetName: - Q_UNREACHABLE(); // Callers of ucalTimeZoneDisplayName() should take care of OffsetName. case QTimeZone::ShortName: return timeType == QTimeZone::DaylightTime ? UCAL_SHORT_DST : UCAL_SHORT_STANDARD; case QTimeZone::DefaultName: case QTimeZone::LongName: return timeType == QTimeZone::DaylightTime ? UCAL_DST : UCAL_STANDARD; + case QTimeZone::OffsetName: + Q_UNREACHABLE(); // Callers of ucalTimeZoneDisplayName() should take care of OffsetName. } Q_UNREACHABLE_RETURN(UCAL_STANDARD); } |