Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2014-02-25 17:59:45 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2014-02-25 18:00:58 (GMT) |
| commit | 0e17d9322793e8baf7ef6904dc96f388e79fd82e (patch) | |
| tree | 8f1fd35e7ca68c0498f14051b06cdf4003f7a8ca /Swift/Controllers | |
| parent | da5e31ec60d089c3ffbafc3246608c95ba44df06 (diff) | |
| download | swift-0e17d9322793e8baf7ef6904dc96f388e79fd82e.zip swift-0e17d9322793e8baf7ef6904dc96f388e79fd82e.tar.bz2 | |
Build with new Boostish stuff.
Can no longer use a shared_ptr as a bool.
Change-Id: Ic92ede082e8f923830af943bb522c64e4f5ff453
Diffstat (limited to 'Swift/Controllers')
| -rw-r--r-- | Swift/Controllers/Chat/ChatController.cpp | 2 | ||||
| -rw-r--r-- | Swift/Controllers/Chat/ChatsManager.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/Chat/ChatController.cpp b/Swift/Controllers/Chat/ChatController.cpp index fd6da94..fb69366 100644 --- a/Swift/Controllers/Chat/ChatController.cpp +++ b/Swift/Controllers/Chat/ChatController.cpp @@ -186,7 +186,7 @@ void ChatController::preHandleIncomingMessage(boost::shared_ptr<MessageEvent> me } } chatStateTracker_->handleMessageReceived(message); - chatStateNotifier_->receivedMessageFromContact(message->getPayload<ChatState>()); + chatStateNotifier_->receivedMessageFromContact(!!message->getPayload<ChatState>()); // handle XEP-0184 Message Receipts // incomming receipts diff --git a/Swift/Controllers/Chat/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp index fef9039..919a3d6 100644 --- a/Swift/Controllers/Chat/ChatsManager.cpp +++ b/Swift/Controllers/Chat/ChatsManager.cpp @@ -798,7 +798,7 @@ void ChatsManager::handleSearchMUCRequest() { void ChatsManager::handleIncomingMessage(boost::shared_ptr<Message> message) { JID jid = message->getFrom(); boost::shared_ptr<MessageEvent> event(new MessageEvent(message)); - bool isInvite = message->getPayload<MUCInvitationPayload>(); + bool isInvite = !!message->getPayload<MUCInvitationPayload>(); bool isMediatedInvite = (message->getPayload<MUCUserPayload>() && message->getPayload<MUCUserPayload>()->getInvite()); if (isMediatedInvite) { jid = (*message->getPayload<MUCUserPayload>()->getInvite()).from; |