From 85d0ea867ee9b607595962dc93d4f09ac0ae1f9a Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 26 Mar 2018 08:29:31 -0400 Subject: Fix compilation on some environments ...where deque<>::difference_type is long rather than int. --- room.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/room.cpp b/room.cpp index 65d0b775..01cba079 100644 --- a/room.cpp +++ b/room.cpp @@ -371,9 +371,11 @@ void Room::Private::updateUnreadCount(timeline_iter_t from, int knownMinimum) Q_ASSERT(from >= q->readMarker().base() && from < timeline.cend()); auto oldUnreadCount = unreadMessages; QElapsedTimer et; et.start(); + // A cast to int, because on some environments count_if returns a long; + // but Qt can only handle int's for container indices etc. unreadMessages = std::max(knownMinimum, - count_if(from, timeline.cend(), - std::bind(&Room::Private::isEventNotable, this, _1))); + int(count_if(from, timeline.cend(), + std::bind(&Room::Private::isEventNotable, this, _1)))); if (et.elapsed() > 10) qCDebug(PROFILER) << "Recounting unread messages took" << et; -- cgit v1.2.3