diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-10-30 14:23:27 +0100 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-10-30 17:27:29 +0100 |
commit | 57e57d9bcda868abcfb552e1247b391162c0dff9 (patch) | |
tree | 7752a32e796d74c8d01a447d1d7376a02cbf7fcc /src/network/ssl/qsslellipticcurve.h | |
parent | d51d312c86128150283b6a41f0daac18d9e57f32 (diff) |
Hide comparison operators for QtNetwork value types from non-ADL
Make them hidden friends, add a private isEqual helper where needed.
Adjust and add documentation.
Fixes: QTBUG-87976
Change-Id: If7c19eeab5be7452364eb76193981100f5516d6b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/network/ssl/qsslellipticcurve.h')
-rw-r--r-- | src/network/ssl/qsslellipticcurve.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/network/ssl/qsslellipticcurve.h b/src/network/ssl/qsslellipticcurve.h index 37f77bde68..2906891fdc 100644 --- a/src/network/ssl/qsslellipticcurve.h +++ b/src/network/ssl/qsslellipticcurve.h @@ -74,7 +74,10 @@ public: private: int id; - friend constexpr bool operator==(QSslEllipticCurve lhs, QSslEllipticCurve rhs) noexcept; + friend constexpr bool operator==(QSslEllipticCurve lhs, QSslEllipticCurve rhs) noexcept + { return lhs.id == rhs.id; } + friend constexpr bool operator!=(QSslEllipticCurve lhs, QSslEllipticCurve rhs) noexcept + { return !(lhs == rhs); } friend constexpr size_t qHash(QSslEllipticCurve curve, size_t seed) noexcept; friend class QSslContext; @@ -87,12 +90,6 @@ Q_DECLARE_TYPEINFO(QSslEllipticCurve, Q_PRIMITIVE_TYPE); constexpr inline size_t qHash(QSslEllipticCurve curve, size_t seed) noexcept { return qHash(curve.id, seed); } -constexpr inline bool operator==(QSslEllipticCurve lhs, QSslEllipticCurve rhs) noexcept -{ return lhs.id == rhs.id; } - -constexpr inline bool operator!=(QSslEllipticCurve lhs, QSslEllipticCurve rhs) noexcept -{ return !operator==(lhs, rhs); } - #ifndef QT_NO_DEBUG_STREAM class QDebug; Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, QSslEllipticCurve curve); |