diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-08-22 11:21:13 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-08-22 11:37:05 +0200 |
commit | 72e490269bba05f8c5841bb58f1ef57e14a7f79f (patch) | |
tree | 6728cfb68d6efe1614a3652e83de7cd998d8e813 | |
parent | e108b1f06d18003d7a758b07bc3bea9922b2e116 (diff) | |
download | qtwebsockets-72e490269bba05f8c5841bb58f1ef57e14a7f79f.tar.gz |
Prospective fix for compilation with WebAssembly/MinGW73
Pass a template argument to std::less/greater.
Amends 54ffd0d0a3bf2c77d53e1cdfe04b362f59682cb4.
Fixes: QTBUG-77500
Change-Id: I0b78906090d8b0e3c910104975c08ff79ba9fc12
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
-rw-r--r-- | src/websockets/qwebsockethandshakeresponse.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/websockets/qwebsockethandshakeresponse.cpp b/src/websockets/qwebsockethandshakeresponse.cpp index 383f1bf..d3ef609 100644 --- a/src/websockets/qwebsockethandshakeresponse.cpp +++ b/src/websockets/qwebsockethandshakeresponse.cpp @@ -162,13 +162,16 @@ QString QWebSocketHandshakeResponse::getHandshakeResponse( if (request.isValid()) { const QString acceptKey = calculateAcceptKey(request.key()); const QList<QString> matchingProtocols = - listIntersection(supportedProtocols, request.protocols(), std::less<>()); + listIntersection(supportedProtocols, request.protocols(), + std::less<QString>()); //TODO: extensions must be kept in the order in which they arrive //cannot use set.intersect() to get the supported extensions const QList<QString> matchingExtensions = - listIntersection(supportedExtensions, request.extensions(), std::less<>()); + listIntersection(supportedExtensions, request.extensions(), + std::less<QString>()); const QList<QWebSocketProtocol::Version> matchingVersions = - listIntersection(supportedVersions, request.versions(), std::greater<>()); //sort in descending order + listIntersection(supportedVersions, request.versions(), + std::greater<QWebSocketProtocol::Version>()); //sort in descending order if (Q_UNLIKELY(matchingVersions.isEmpty())) { m_error = QWebSocketProtocol::CloseCodeProtocolError; |