From f2cd364e146ab86d4ef623c4d85b37f298c92dc9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 11 Mar 2017 17:13:57 +0300
Subject: [PATCH] Alpha 1.0.21: Fix more compilation bugs.

---
 Telegram/SourceFiles/core/utils.h           | 18 ++++++++++++++++++
 Telegram/SourceFiles/mtproto/connection.cpp |  2 +-
 Telegram/SourceFiles/mtproto/dc_options.cpp |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/core/utils.h b/Telegram/SourceFiles/core/utils.h
index ed05b702a..0c27d507c 100644
--- a/Telegram/SourceFiles/core/utils.h
+++ b/Telegram/SourceFiles/core/utils.h
@@ -53,6 +53,24 @@ inline void t_assert_fail(const char *message, const char *file, int32 line) {
 #define Ensures(condition) t_assert_full(condition, "\"" #condition "\"", __FILE__, __LINE__)
 #endif // Ensures
 
+// Define specializations for QByteArray for Qt 5.3.2, because
+// QByteArray in Qt 5.3.2 doesn't declare "pointer" subtype.
+#ifdef OS_MAC_OLD
+namespace gsl {
+
+template <>
+inline span<char> make_span<QByteArray>(QByteArray &cont) {
+	return span<char>(cont.data(), cont.size());
+}
+
+template <>
+inline span<const char> make_span(const QByteArray &cont) {
+	return span<const char>(cont.constData(), cont.size());
+}
+
+} // namespace gsl
+#endif // OS_MAC_OLD
+
 namespace base {
 
 template <typename T, size_t N>
diff --git a/Telegram/SourceFiles/mtproto/connection.cpp b/Telegram/SourceFiles/mtproto/connection.cpp
index 2394fbc3d..9e1388ff5 100644
--- a/Telegram/SourceFiles/mtproto/connection.cpp
+++ b/Telegram/SourceFiles/mtproto/connection.cpp
@@ -2072,7 +2072,7 @@ mtpBuffer ConnectionPrivate::ungzip(const mtpPrime *from, const mtpPrime *end) c
 		if (res != Z_OK && res != Z_STREAM_END) {
 			inflateEnd(&stream);
 			LOG(("RPC Error: could not unpack gziped data, code: %1").arg(res));
-			DEBUG_LOG(("RPC Error: bad gzip: %1").arg(Logs::mb(&packed.v[0], packedLen).str()));
+			DEBUG_LOG(("RPC Error: bad gzip: %1").arg(Logs::mb(packed.v.constData(), packedLen).str()));
 			return mtpBuffer();
 		}
 	}
diff --git a/Telegram/SourceFiles/mtproto/dc_options.cpp b/Telegram/SourceFiles/mtproto/dc_options.cpp
index 8ab5e7817..8fbda1645 100644
--- a/Telegram/SourceFiles/mtproto/dc_options.cpp
+++ b/Telegram/SourceFiles/mtproto/dc_options.cpp
@@ -72,7 +72,7 @@ void DcOptions::processFromList(const QVector<MTPDcOption> &options, bool overwr
 			}
 
 			shiftedIdsProcessed.push_back(dcIdWithShift);
-			auto &ip = std::string(option.vip_address.v.constData(), option.vip_address.v.size());
+			auto ip = std::string(option.vip_address.v.constData(), option.vip_address.v.size());
 			auto port = option.vport.v;
 			if (applyOneGuarded(dcId, flags, ip, port)) {
 				if (!base::contains(idsChanged, dcId)) {