Swiftdiff options
Diffstat (limited to 'Swift/Controllers/XMPPEvents/EventController.cpp')
| -rw-r--r-- | Swift/Controllers/XMPPEvents/EventController.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Swift/Controllers/XMPPEvents/EventController.cpp b/Swift/Controllers/XMPPEvents/EventController.cpp index 9841923..8cb259b 100644 --- a/Swift/Controllers/XMPPEvents/EventController.cpp +++ b/Swift/Controllers/XMPPEvents/EventController.cpp @@ -8,4 +8,5 @@ #include <boost/bind.hpp> +#include <boost/numeric/conversion/cast.hpp> #include <algorithm> @@ -35,5 +36,6 @@ void EventController::handleIncomingEvent(boost::shared_ptr<StanzaEvent> sourceE /* If it's a duplicate subscription request, remove the previous request first */ if (subscriptionEvent) { - foreach(boost::shared_ptr<StanzaEvent> existingEvent, events_) { + EventList existingEvents(events_); + foreach(boost::shared_ptr<StanzaEvent> existingEvent, existingEvents) { boost::shared_ptr<SubscriptionRequestEvent> existingSubscriptionEvent = boost::dynamic_pointer_cast<SubscriptionRequestEvent>(existingEvent); if (existingSubscriptionEvent) { @@ -48,5 +50,5 @@ void EventController::handleIncomingEvent(boost::shared_ptr<StanzaEvent> sourceE events_.push_back(sourceEvent); sourceEvent->onConclusion.connect(boost::bind(&EventController::handleEventConcluded, this, sourceEvent)); - onEventQueueLengthChange(events_.size()); + onEventQueueLengthChange(boost::numeric_cast<int>(events_.size())); onEventQueueEventAdded(sourceEvent); if (sourceEvent->getConcluded()) { @@ -59,5 +61,5 @@ void EventController::handleEventConcluded(boost::shared_ptr<StanzaEvent> event) event->onConclusion.disconnect(boost::bind(&EventController::handleEventConcluded, this, event)); events_.erase(std::remove(events_.begin(), events_.end(), event), events_.end()); - onEventQueueLengthChange(events_.size()); + onEventQueueLengthChange(boost::numeric_cast<int>(events_.size())); } |