From ce9da1ba1e0f3db068c86ef852a21fc687593237 Mon Sep 17 00:00:00 2001 From: Ivan Sorokin Date: Mon, 23 Jun 2014 00:14:10 +0400 Subject: [PATCH] Fix alertdispatcher.cpp compilability on Qt5. --- src/qtlibtorrent/alertdispatcher.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qtlibtorrent/alertdispatcher.cpp b/src/qtlibtorrent/alertdispatcher.cpp index 80d5291ff..b9d3a7a53 100644 --- a/src/qtlibtorrent/alertdispatcher.cpp +++ b/src/qtlibtorrent/alertdispatcher.cpp @@ -82,13 +82,21 @@ void QAlertDispatcher::getPendingAlerts(std::deque& out, uns void QAlertDispatcher::dispatch(QSharedPointer > tag, std::auto_ptr alert_ptr) { +#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) + QAlertDispatcher* that = tag->loadAcquire(); +#else QAlertDispatcher* that = *tag; +#endif if (!that) return; QMutexLocker lock(&(that->alerts_mutex)); +#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) + if (!tag->load()) +#else if (!*tag) +#endif return; bool was_empty = that->alerts.empty();