From 0c281bcc65f908a0b29ed89c0328a085b7be9db5 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 20 Jan 2015 14:35:42 +0100 Subject: QSslEllipticCurve: add missing noexcept Change-Id: I94701ddb78a822adf35aea57f9e171a747745f6b Reviewed-by: Giuseppe D'Angelo --- src/network/ssl/qsslellipticcurve.h | 6 +++--- src/network/ssl/qsslellipticcurve_openssl.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/network/ssl/qsslellipticcurve.h b/src/network/ssl/qsslellipticcurve.h index d123337d0a..d05ed40872 100644 --- a/src/network/ssl/qsslellipticcurve.h +++ b/src/network/ssl/qsslellipticcurve.h @@ -55,7 +55,7 @@ Q_DECL_CONSTEXPR uint qHash(QSslEllipticCurve curve, uint seed = 0) Q_DECL_NOTHR class QSslEllipticCurve { public: - Q_DECL_CONSTEXPR QSslEllipticCurve() + Q_DECL_CONSTEXPR QSslEllipticCurve() Q_DECL_NOTHROW : id(0) { } @@ -66,12 +66,12 @@ public: Q_NETWORK_EXPORT QString shortName() const Q_REQUIRED_RESULT; Q_NETWORK_EXPORT QString longName() const Q_REQUIRED_RESULT; - Q_DECL_CONSTEXPR bool isValid() const + Q_DECL_CONSTEXPR bool isValid() const Q_DECL_NOTHROW { return id != 0; } - Q_NETWORK_EXPORT bool isTlsNamedCurve() const; + Q_NETWORK_EXPORT bool isTlsNamedCurve() const Q_DECL_NOTHROW; private: int id; diff --git a/src/network/ssl/qsslellipticcurve_openssl.cpp b/src/network/ssl/qsslellipticcurve_openssl.cpp index e8f6cfee9e..e44d85e397 100644 --- a/src/network/ssl/qsslellipticcurve_openssl.cpp +++ b/src/network/ssl/qsslellipticcurve_openssl.cpp @@ -178,7 +178,7 @@ static const int tlsNamedCurveNIDs[] = { static const size_t tlsNamedCurveNIDCount = sizeof(tlsNamedCurveNIDs) / sizeof(tlsNamedCurveNIDs[0]); -bool QSslEllipticCurve::isTlsNamedCurve() const +bool QSslEllipticCurve::isTlsNamedCurve() const Q_DECL_NOTHROW { const int * const tlsNamedCurveNIDsEnd = tlsNamedCurveNIDs + tlsNamedCurveNIDCount; return std::find(tlsNamedCurveNIDs, tlsNamedCurveNIDsEnd, id) != tlsNamedCurveNIDsEnd; -- cgit v1.2.3