diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2024-08-01 11:17:03 +0200 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2024-08-18 11:14:00 +0200 |
| commit | 7447ad503330ed176cf369792ffb33b7e00a58d3 (patch) | |
| tree | 297b9873f95106cd8af4b1cfd60e5f3b5a64b701 /src/corelib/global/qnumeric.cpp | |
| parent | 47fd38be4bce0958fcfce8080d1580c4e3c2a15b (diff) | |
Rename qt_saturate to q26::saturate_cast
C++26 adds std::saturate_cast, so follow the established pattern of
other similar "backported" APIs. The old name is left around while
we port other submodules.
While at it, move qt_saturate's tests to the qnumeric test.
Pick-to: 6.8
Change-Id: I653a2e3d936081378298a9c8e51e7c1a2d438d83
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global/qnumeric.cpp')
| -rw-r--r-- | src/corelib/global/qnumeric.cpp | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/src/corelib/global/qnumeric.cpp b/src/corelib/global/qnumeric.cpp index a46039c5da5..16b2b7ca408 100644 --- a/src/corelib/global/qnumeric.cpp +++ b/src/corelib/global/qnumeric.cpp @@ -458,39 +458,4 @@ Q_CORE_EXPORT quint64 qFloatDistance(double a, double b) Returns true if the absolute value of \a f is within 0.00001f of 0.0. */ -namespace QtNumericTests { - -template <typename T> static constexpr T max = std::numeric_limits<T>::max(); -template <typename T> static constexpr T min = std::numeric_limits<T>::min(); - -static_assert(qt_saturate<short>(max<unsigned>) == max<short>); -static_assert(qt_saturate<int>(max<unsigned>) == max<int>); -static_assert(qt_saturate<qint64>(max<unsigned>) == qint64(max<unsigned>)); - -static_assert(qt_saturate<short>(max<int>) == max<short>); -static_assert(qt_saturate<unsigned>(max<int>) == unsigned(max<int>)); -static_assert(qt_saturate<qint64>(max<int>) == qint64(max<int>)); - -static_assert(qt_saturate<short>(max<qint64>) == max<short>); -static_assert(qt_saturate<int>(max<qint64>) == max<int>); -static_assert(qt_saturate<unsigned>(max<qint64>) == max<unsigned>); -static_assert(qt_saturate<quint64>(max<qint64>) == quint64(max<qint64>)); - -static_assert(qt_saturate<short>(max<quint64>) == max<short>); -static_assert(qt_saturate<int>(max<quint64>) == max<int>); -static_assert(qt_saturate<unsigned>(max<quint64>) == max<unsigned>); -static_assert(qt_saturate<qint64>(max<quint64>) == max<qint64>); - -static_assert(qt_saturate<short>(min<int>) == min<short>); -static_assert(qt_saturate<qint64>(min<int>) == qint64(min<int>)); -static_assert(qt_saturate<unsigned>(min<int>) == 0); -static_assert(qt_saturate<quint64>(min<int>) == 0); - -static_assert(qt_saturate<short>(min<qint64>) == min<short>); -static_assert(qt_saturate<int>(min<qint64>) == min<int>); -static_assert(qt_saturate<unsigned>(min<qint64>) == 0); -static_assert(qt_saturate<quint64>(min<qint64>) == 0); - -} // namespace QtNumericTests - QT_END_NAMESPACE |