Alpha version 1.2.21: Fix build for Xcode.

This commit is contained in:
John Preston 2018-05-18 21:07:31 +03:00
parent 678b9a8eb5
commit f2a5a29d12
3 changed files with 12 additions and 14 deletions

View File

@ -178,7 +178,7 @@ TimeMs ResolvingConnection::pingTime() const {
}
TimeMs ResolvingConnection::fullConnectTimeout() const {
return kOneConnectionTimeout * std::max(_proxy.resolvedIPs.size(), 1U);
return kOneConnectionTimeout * qMax(int(_proxy.resolvedIPs.size()), 1);
}
void ResolvingConnection::sendData(mtpBuffer &buffer) {

View File

@ -129,18 +129,6 @@ QByteArray ConcatenateDnsTxtFields(const std::vector<DnsEntry> &response) {
} // namespace
struct ServiceWebRequest {
ServiceWebRequest(not_null<QNetworkReply*> reply);
ServiceWebRequest(ServiceWebRequest &&other);
ServiceWebRequest &operator=(ServiceWebRequest &&other);
~ServiceWebRequest();
void destroy();
QPointer<QNetworkReply> reply;
};
ServiceWebRequest::ServiceWebRequest(not_null<QNetworkReply*> reply)
: reply(reply.get()) {
}

View File

@ -11,7 +11,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
namespace MTP {
struct ServiceWebRequest;
struct ServiceWebRequest {
ServiceWebRequest(not_null<QNetworkReply*> reply);
ServiceWebRequest(ServiceWebRequest &&other);
ServiceWebRequest &operator=(ServiceWebRequest &&other);
~ServiceWebRequest();
void destroy();
QPointer<QNetworkReply> reply;
};
class SpecialConfigRequest : public QObject {
public: