aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/syncdata.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/syncdata.cpp b/lib/syncdata.cpp
index ff3dc0c2..93416bc4 100644
--- a/lib/syncdata.cpp
+++ b/lib/syncdata.cpp
@@ -18,9 +18,10 @@ bool RoomSummary::isEmpty() const
bool RoomSummary::merge(const RoomSummary& other)
{
// Using bitwise OR to prevent computation shortcut.
- return joinedMemberCount.merge(other.joinedMemberCount)
- | invitedMemberCount.merge(other.invitedMemberCount)
- | heroes.merge(other.heroes);
+ return static_cast<bool>(
+ static_cast<int>(joinedMemberCount.merge(other.joinedMemberCount))
+ | static_cast<int>(invitedMemberCount.merge(other.invitedMemberCount))
+ | static_cast<int>(heroes.merge(other.heroes)));
}
QDebug Quotient::operator<<(QDebug dbg, const RoomSummary& rs)