diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-26 13:46:21 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-02 21:57:49 +0100 |
| commit | d3f8d7fd4140b269532e2daca8eb5cbfe28ed465 (patch) | |
| tree | 957d11b44a56faa9b1b4f3c84f3d8495cf618050 /src/corelib/global/qnumeric.cpp | |
| parent | 9d2f3e63b86b48fd402aa126569746c9111f5ccc (diff) | |
QtCore: Disambiguate static variables
They cause clashes in CMake Unity (Jumbo) builds.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: I5f1fbee07872a742a78adc9864fe00c710ca24d0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global/qnumeric.cpp')
| -rw-r--r-- | src/corelib/global/qnumeric.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/global/qnumeric.cpp b/src/corelib/global/qnumeric.cpp index e492e3f02a0..a46039c5da5 100644 --- a/src/corelib/global/qnumeric.cpp +++ b/src/corelib/global/qnumeric.cpp @@ -458,6 +458,8 @@ 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(); @@ -489,4 +491,6 @@ 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 |