From 00e6da9d6458e73dd7391612ea836f8bbc40e4c1 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 1 May 2025 12:20:53 +0400 Subject: [PATCH] Fix build with Xcode. --- Telegram/SourceFiles/boxes/star_gift_box.cpp | 8 +++----- .../history/view/history_view_translate_tracker.cpp | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp index c9c3e049fa..7d8f52f687 100644 --- a/Telegram/SourceFiles/boxes/star_gift_box.cpp +++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp @@ -198,9 +198,6 @@ struct ResaleFilter { base::flat_set attributes; ResaleSort sort = ResaleSort::Date; - friend inline auto operator<=>( - const ResaleFilter &, - const ResaleFilter &) = default; friend inline bool operator==( const ResaleFilter &, const ResaleFilter &) = default; @@ -1247,7 +1244,7 @@ struct ResaleTabs { }; actionWithIcon(tr::lng_gift_resale_sort_price(tr::now), [=] { sort(ResaleSort::Price); - }, &st::menuIconOrderPrice, is(ResaleSort::Price)); AssertIsDebug(icons); + }, &st::menuIconOrderPrice, is(ResaleSort::Price)); actionWithIcon(tr::lng_gift_resale_sort_date(tr::now), [=] { sort(ResaleSort::Date); }, &st::menuIconOrderDate, is(ResaleSort::Date)); @@ -4920,7 +4917,7 @@ void ShowResaleGiftBoughtToast( const Data::UniqueGift &gift) { show->showToast({ .title = tr::lng_gift_sent_title(tr::now), - .text = (to->isSelf() + .text = TextWithEntities{ (to->isSelf() ? tr::lng_gift_sent_resale_done_self( tr::now, lt_gift, @@ -4929,6 +4926,7 @@ void ShowResaleGiftBoughtToast( tr::now, lt_user, to->shortName())), + }, .duration = kUpgradeDoneToastDuration, }); } diff --git a/Telegram/SourceFiles/history/view/history_view_translate_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_translate_tracker.cpp index 5d3eae9b07..d16eee60e6 100644 --- a/Telegram/SourceFiles/history/view/history_view_translate_tracker.cpp +++ b/Telegram/SourceFiles/history/view/history_view_translate_tracker.cpp @@ -55,7 +55,7 @@ void TranslateTracker::setup() { const auto channel = peer->asChannel(); auto autoTranslationValue = (channel - ? channel->flagsValue() + ? (channel->flagsValue() | rpl::type_erased()) : rpl::single(Data::Flags::Change({}, {})) ) | rpl::map([=](Data::Flags::Change data) { return (data.value & ChannelDataFlag::AutoTranslation);