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

be compatible with range-v3 0.9.x/1.0 branch 

This made 2 changes to the current code base to be compatible with higher versions of range-v3 library.
1. ranges::iterator_range was renamed to subrange, see https://github.com/ericniebler/range-v3/issues/766
2. PercentCounterItem need an operator== for ranges::sort for some reason
This commit is contained in:
Jiachen YANG 2019-09-08 00:13:40 +09:00 committed by John Preston
parent 684cfa16b8
commit 9d850b71e7
6 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp
View File

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

2
Telegram/SourceFiles/data/data_channel.cpp
View File

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

2
Telegram/SourceFiles/history/history_inner_widget.cpp
View File

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

4
Telegram/SourceFiles/history/view/media/history_view_poll.cpp
View File

@ -34,6 +34,10 @@ struct PercentCounterItem {
int percent = 0; int percent = 0;
int remainder = 0; int remainder = 0;
inline bool operator==(const PercentCounterItem &o) const {
return remainder == o.remainder && percent == o.percent;
}
inline bool operator<(const PercentCounterItem &other) const { inline bool operator<(const PercentCounterItem &other) const {
if (remainder > other.remainder) { if (remainder > other.remainder) {
return true; return true;

8
Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp
View File

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

4
Telegram/SourceFiles/ui/text/text_entity.cpp
View File

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