From 0401364d71422e30df342648403e493dd305cc7c Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 9 Jun 2023 21:25:26 +0400 Subject: [PATCH] Fix build with Xcode. --- Telegram/SourceFiles/data/data_stories.cpp | 6 +++--- Telegram/SourceFiles/data/data_stories.h | 17 +++++++++++++++++ .../media/stories/media_stories_reply.cpp | 2 +- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp index 5a51f0360..c0f70b925 100644 --- a/Telegram/SourceFiles/data/data_stories.cpp +++ b/Telegram/SourceFiles/data/data_stories.cpp @@ -515,7 +515,7 @@ void Stories::parseAndApply(const MTPUserStories &stories) { i->second = std::move(result); } } else { - _all.emplace(peerId, std::move(result)).first; + _all.emplace(peerId, std::move(result)); } const auto add = [&](StorySourcesList list) { auto &sources = _sources[static_cast(list)]; @@ -1251,7 +1251,7 @@ void Stories::sendIncrementViewsRequests() { const auto api = &_owner->session().api(); for (auto &[peer, ids] : prepared) { _incrementViewsRequests.emplace(peer); - const auto finish = [=] { + const auto finish = [=, peer = peer] { _incrementViewsRequests.remove(peer); if (!_incrementViewsTimer.isActive() && _incrementViewsPending.contains(peer)) { @@ -1462,4 +1462,4 @@ bool Stories::isQuitPrevent() { return true; } -} // namespace Data \ No newline at end of file +} // namespace Data diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h index 9cde3d245..b7de66759 100644 --- a/Telegram/SourceFiles/data/data_stories.h +++ b/Telegram/SourceFiles/data/data_stories.h @@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once +#include "base/qt/qt_compare.h" #include "base/expected.h" #include "base/timer.h" #include "base/weak_ptr.h" @@ -155,15 +156,31 @@ enum class StorySourcesList : uchar { }; struct StoriesContextSingle { + friend inline auto operator<=>( + StoriesContextSingle, + StoriesContextSingle) = default; + friend inline bool operator==(StoriesContextSingle, StoriesContextSingle) = default; }; struct StoriesContextPeer { + friend inline auto operator<=>( + StoriesContextPeer, + StoriesContextPeer) = default; + friend inline bool operator==(StoriesContextPeer, StoriesContextPeer) = default; }; struct StoriesContextSaved { + friend inline auto operator<=>( + StoriesContextSaved, + StoriesContextSaved) = default; + friend inline bool operator==(StoriesContextSaved, StoriesContextSaved) = default; }; struct StoriesContextArchive { + friend inline auto operator<=>( + StoriesContextArchive, + StoriesContextArchive) = default; + friend inline bool operator==(StoriesContextArchive, StoriesContextArchive) = default; }; struct StoriesContext { diff --git a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp index 1ccce96a6..becd18b49 100644 --- a/Telegram/SourceFiles/media/stories/media_stories_reply.cpp +++ b/Telegram/SourceFiles/media/stories/media_stories_reply.cpp @@ -117,7 +117,7 @@ void ReplyArea::sendReaction(const Data::ReactionId &id) { const auto id = Data::SerializeCustomEmojiId(customId); message.textWithTags = { text, - { { 0, text.size(), Ui::InputField::CustomEmojiLink(id) } } + { { 0, int(text.size()), Ui::InputField::CustomEmojiLink(id) } } }; } }