diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-02-22 08:53:13 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-02-22 20:12:29 +0000 |
| commit | b727f2190fb4878aad5edf1536e875e1b75907ae (patch) | |
| tree | e5eb647d82dff44d8a7ef5c8693885ba0b4850cc /src/corelib/time/qtimezoneprivate_p.h | |
| parent | a87edb9ae97ca10cb651b004817ee4ba09159f8b (diff) | |
Protect headers against min/max macros
... using the usual pattern, which, being idiomatic, doesn't need a
comment explaining it.
Pick-to: 6.3
Change-Id: Id6b12450495a18f89e1f83f2018b6218b03ff6a7
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/time/qtimezoneprivate_p.h')
| -rw-r--r-- | src/corelib/time/qtimezoneprivate_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/time/qtimezoneprivate_p.h b/src/corelib/time/qtimezoneprivate_p.h index a436c87999..9472586fd9 100644 --- a/src/corelib/time/qtimezoneprivate_p.h +++ b/src/corelib/time/qtimezoneprivate_p.h @@ -137,10 +137,10 @@ public: virtual void serialize(QDataStream &ds) const; // Static Utility Methods - static inline qint64 maxMSecs() { return std::numeric_limits<qint64>::max(); } - static inline qint64 minMSecs() { return std::numeric_limits<qint64>::min() + 1; } - static inline qint64 invalidMSecs() { return std::numeric_limits<qint64>::min(); } - static inline qint64 invalidSeconds() { return std::numeric_limits<int>::min(); } + static inline qint64 maxMSecs() { return (std::numeric_limits<qint64>::max)(); } + static inline qint64 minMSecs() { return (std::numeric_limits<qint64>::min)() + 1; } + static inline qint64 invalidMSecs() { return (std::numeric_limits<qint64>::min)(); } + static inline qint64 invalidSeconds() { return (std::numeric_limits<int>::min)(); } static Data invalidData(); static QTimeZone::OffsetData invalidOffsetData(); static QTimeZone::OffsetData toOffsetData(const Data &data); |