diff options
Diffstat (limited to 'src/network/ssl/qdtls_openssl_p.h')
-rw-r--r-- | src/network/ssl/qdtls_openssl_p.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/network/ssl/qdtls_openssl_p.h b/src/network/ssl/qdtls_openssl_p.h index 6e9e59cbd2..281e1133cd 100644 --- a/src/network/ssl/qdtls_openssl_p.h +++ b/src/network/ssl/qdtls_openssl_p.h @@ -58,6 +58,7 @@ #include <QtNetwork/qhostaddress.h> #include <QtCore/qbytearray.h> +#include <QtCore/qglobal.h> #include <QtCore/qlist.h> #include <QtCore/qsharedpointer.h> @@ -134,6 +135,13 @@ private: } // namespace dtlsopenssl +// The trick with 'right' ancestor in the tree overriding (only once) some shared +// virtual functions is intentional. Too bad MSVC warns me about ... exactly the +// feature of C++ that I want to use. + +QT_WARNING_PUSH +QT_WARNING_DISABLE_MSVC(4250) + class QDtlsClientVerifierOpenSSL : public QTlsPrivate::DtlsCookieVerifier, public QDtlsBasePrivate { public: @@ -236,6 +244,8 @@ private: QByteArray identityHint; }; +QT_WARNING_POP // C4250 + QT_END_NAMESPACE #endif // QDTLS_OPENSSL_P_H |