Version 1.8.12: Fix build for Xcode.

This commit is contained in:
John Preston 2019-10-02 12:54:29 +03:00
parent 60640c7087
commit ecfe1dacb2
6 changed files with 11 additions and 9 deletions

View File

@ -449,7 +449,7 @@ std::vector<Result> EmojiKeywords::LangPack::query(
}
const auto from = _data.emoji.lower_bound(normalized);
auto &&chosen = ranges::subrange(
auto &&chosen = ranges::make_subrange(
from,
end(_data.emoji)
) | ranges::view::take_while([&](const auto &pair) {

View File

@ -764,7 +764,7 @@ void ApplyMegagroupAdmins(
}
auto adding = base::flat_map<UserId, QString>();
auto admins = ranges::subrange(
auto admins = ranges::make_subrange(
list.begin(), list.end()
) | ranges::view::transform([](const MTPChannelParticipant &p) {
const auto userId = p.match([](const auto &data) {

View File

@ -2444,7 +2444,7 @@ MessageIdsList HistoryInner::getSelectedItems() const {
return {};
}
auto result = ranges::subrange(
auto result = ranges::make_subrange(
_selected.begin(),
_selected.end()
) | view::filter([](const auto &selected) {

View File

@ -291,7 +291,7 @@ auto Reader::Slice::prepareFill(int from, int till) -> PrepareFillResult {
ranges::less(),
&PartsMap::value_type::first);
const auto haveTill = FindNotLoadedStart(
ranges::subrange(start, finish),
ranges::make_subrange(start, finish),
fromOffset);
if (haveTill < till) {
result.offsetsFromLoader = offsetsFromLoader(
@ -607,14 +607,14 @@ auto Reader::Slices::fill(int offset, bytes::span buffer) -> FillResult {
markSliceUsed(fromSlice);
CopyLoaded(
buffer,
ranges::subrange(first.start, first.finish),
ranges::make_subrange(first.start, first.finish),
firstFrom,
firstTill);
if (fromSlice + 1 < tillSlice) {
markSliceUsed(fromSlice + 1);
CopyLoaded(
buffer.subspan(firstTill - firstFrom),
ranges::subrange(second.start, second.finish),
ranges::make_subrange(second.start, second.finish),
secondFrom,
secondTill);
}
@ -644,7 +644,7 @@ auto Reader::Slices::fillFromHeader(int offset, bytes::span buffer)
if (prepared.ready) {
CopyLoaded(
buffer,
ranges::subrange(prepared.start, prepared.finish),
ranges::make_subrange(prepared.start, prepared.finish),
from,
till);
result.filled = true;

View File

@ -1141,7 +1141,7 @@ const QRegularExpression &RegExpWordSplit() {
[[nodiscard]] QString ExpandCustomLinks(const TextWithTags &text) {
const auto entities = ConvertTextTagsToEntities(text.tags);
auto &&urls = ranges::subrange(
auto &&urls = ranges::make_subrange(
entities.begin(),
entities.end()
) | ranges::view::filter([](const EntityInText &entity) {
@ -2098,7 +2098,7 @@ EntityInText::EntityInText(
int EntityInText::FirstMonospaceOffset(
const EntitiesInText &entities,
int textLength) {
auto &&monospace = ranges::subrange(
auto &&monospace = ranges::make_subrange(
entities.begin(),
entities.end()
) | ranges::view::filter([](const EntityInText & entity) {

View File

@ -64,6 +64,7 @@
'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES',
'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',
'GCC_OPTIMIZATION_LEVEL': '0',
'GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS': 'NO', # temp for range-v3
'ALWAYS_SEARCH_USER_PATHS': 'NO',
},
'configurations': {
@ -88,6 +89,7 @@
'OTHER_LDFLAGS': [
'-w', # Suppress 'libstdc++ is deprecated' warning.
],
'GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS': 'NO', # temp for range-v3
},
'defines': [
'OS_MAC_OLD',