wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

cleanup of previous check-in. fixing boost-1.34 compatibility and syntax error

This commit is contained in:
Arvid Norberg 2009-01-23 17:06:23 +00:00
parent 9b5aa967b0
commit 76cea23b4c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/libtorrent/aux_/session_impl.hpp
View File

@ -53,7 +53,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include <boost/filesystem/path.hpp> #include <boost/filesystem/path.hpp>
#include <boost/thread.hpp> #include <boost/thread.hpp>
#include <boost/thread/recursive_mutex.hpp> #include <boost/thread/recursive_mutex.hpp>
#include <boost/thread/condition_variable.hpp> #include <boost/thread/condition.hpp>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
@ -329,7 +329,7 @@ namespace libtorrent
// private: // private:
void session_impl::dht_state_callback(boost::condition_variable_any& c void dht_state_callback(boost::condition& c
, entry& e, bool& done) const; , entry& e, bool& done) const;
void on_lsd_peer(tcp::endpoint peer, sha1_hash const& ih); void on_lsd_peer(tcp::endpoint peer, sha1_hash const& ih);

6
src/session_impl.cpp
View File

@ -2331,11 +2331,11 @@ namespace aux {
m_dht_settings.service_port = m_listen_interface.port(); m_dht_settings.service_port = m_listen_interface.port();
} }
void session_impl::dht_state_callback(boost::condition_variable_any& c void session_impl::dht_state_callback(boost::condition& c
, entry& e, bool& done) const , entry& e, bool& done) const
{ {
if (m_dht) e = m_dht->state();
mutex_t::scoped_lock l(m_mutex); mutex_t::scoped_lock l(m_mutex);
if (m_dht) e = m_dht->state();
done = true; done = true;
l.unlock(); l.unlock();
c.notify_all(); c.notify_all();
@ -2343,7 +2343,7 @@ namespace aux {
entry session_impl::dht_state() const entry session_impl::dht_state() const
{ {
boost::condition_variable_any cond; boost::condition cond;
mutex_t::scoped_lock l(m_mutex); mutex_t::scoped_lock l(m_mutex);
if (!m_dht) return entry(); if (!m_dht) return entry();
entry e; entry e;