From 9d3ea273e291a40e34f86b4beeaa6b59bc3260dd Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 14 Dec 2017 20:20:33 +0900 Subject: Another fix for CI on OSX --- room.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/room.cpp b/room.cpp index 0a52c7c8..d39e6d32 100644 --- a/room.cpp +++ b/room.cpp @@ -42,7 +42,6 @@ #include #include -#include using namespace QMatrixClient; using namespace std::placeholders; @@ -273,7 +272,7 @@ Room::Private::promoteReadMarker(User* u, Room::rev_iter_t newMarker, if (isLocalUser(u) && unreadMessages) { auto stillUnreadMessagesCount = count_if(eagerMarker, timeline.cend(), - bind(&Room::Private::isEventNotable, this, _1)); + std::bind(&Room::Private::isEventNotable, this, _1)); if (stillUnreadMessagesCount == 0) { @@ -859,7 +858,7 @@ void Room::Private::checkUnreadMessages(timeline_iter_t from) { Q_ASSERT(from < timeline.cend()); const auto newUnreadMessages = count_if(from, timeline.cend(), - bind(&Room::Private::isEventNotable, this, _1)); + std::bind(&Room::Private::isEventNotable, this, _1)); // The first event in the just-added batch (referred to by upTo.base()) // defines whose read marker can possibly be promoted any further over -- cgit v1.2.3