qbittorrent/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-12-12 12:36:15 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #5958 from dzmat/auto_ptr_eviction

Browse Source 
minimizing the number of warnings about deprecated auto_ptr
This commit is contained in:
sledgehammer999 2016-12-10 21:23:42 +02:00 committed by GitHub
commit 4e8ca90b23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/base/bittorrent/session.cpp
View File

@ -331,7 +331,7 @@ Session::Session(QObject *parent)
configureListeningInterface(); configureListeningInterface();
m_nativeSession->set_alert_dispatch([this](std::auto_ptr<libt::alert> alertPtr) m_nativeSession->set_alert_dispatch([this](std::auto_ptr<libt::alert> alertPtr)
{ {
dispatchAlerts(alertPtr); dispatchAlerts(alertPtr.release());
}); });
#else #else
std::string peerId = libt::generate_fingerprint(PEER_ID, VERSION_MAJOR, VERSION_MINOR, VERSION_BUGFIX, VERSION_BUILD); std::string peerId = libt::generate_fingerprint(PEER_ID, VERSION_MAJOR, VERSION_MINOR, VERSION_BUGFIX, VERSION_BUILD);
@ -3125,13 +3125,13 @@ void Session::handleIPFilterError()
} }
#if LIBTORRENT_VERSION_NUM < 10100 #if LIBTORRENT_VERSION_NUM < 10100
void Session::dispatchAlerts(std::auto_ptr<libt::alert> alertPtr) void Session::dispatchAlerts(libt::alert *alertPtr)
{ {
QMutexLocker lock(&m_alertsMutex); QMutexLocker lock(&m_alertsMutex);
bool wasEmpty = m_alerts.empty(); bool wasEmpty = m_alerts.empty();
m_alerts.push_back(alertPtr.release()); m_alerts.push_back(alertPtr);
if (wasEmpty) { if (wasEmpty) {
m_alertsWaitCondition.wakeAll(); m_alertsWaitCondition.wakeAll();

2
src/base/bittorrent/session.h
View File

@ -492,7 +492,7 @@ namespace BitTorrent
void saveResumeData(); void saveResumeData();
#if LIBTORRENT_VERSION_NUM < 10100 #if LIBTORRENT_VERSION_NUM < 10100
void dispatchAlerts(std::auto_ptr<libtorrent::alert> alertPtr); void dispatchAlerts(libtorrent::alert *alertPtr);
#endif #endif
void getPendingAlerts(std::vector<libtorrent::alert *> &out, ulong time = 0); void getPendingAlerts(std::vector<libtorrent::alert *> &out, ulong time = 0);