procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Closed beta version 1.3.14.1: Fix for OS X old.

This commit is contained in:
John Preston 2018-08-30 16:29:19 +03:00
parent 7150811aef
commit 736789a9ed
5 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/base/base_pch.h
View File

@ -14,6 +14,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QtCore/QThread> #include <QtCore/QThread>
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#define OS_MAC_OLD
#endif // QT_VERSION < 5.5.0
#include <crl/crl.h> #include <crl/crl.h>
#include <rpl/rpl.h> #include <rpl/rpl.h>

18
Telegram/SourceFiles/base/basic_types.h
View File

@ -47,3 +47,21 @@ using float64 = double;
using TimeMs = int64; using TimeMs = int64;
using TimeId = int32; using TimeId = int32;
// 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

18
Telegram/SourceFiles/core/utils.h
View File

@ -23,24 +23,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#define qsl(s) QStringLiteral(s) #define qsl(s) QStringLiteral(s)
// 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 { namespace base {
template <typename D, typename T> template <typename D, typename T>

2
Telegram/SourceFiles/storage/cache/storage_cache_types.h vendored
View File

@ -11,6 +11,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/flat_map.h" #include "base/flat_map.h"
#include "base/optional.h" #include "base/optional.h"
#include <crl/crl_time.h> #include <crl/crl_time.h>
#include <QtCore/QString>
#include <QtCore/QByteArray>
namespace Storage { namespace Storage {
namespace Cache { namespace Cache {

4
Telegram/SourceFiles/storage/storage_pch.h
View File

@ -12,6 +12,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QtCore/QByteArray> #include <QtCore/QByteArray>
#include <QtCore/QString> #include <QtCore/QString>
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
#define OS_MAC_OLD
#endif // QT_VERSION < 5.5.0
#include <crl/crl.h> #include <crl/crl.h>
#include <rpl/rpl.h> #include <rpl/rpl.h>