twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-01-10 14:58:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #388 from erqan/fix-#387

Browse Source 
quick fix for #387
This commit is contained in:
miguelfreitas 2016-09-01 11:33:01 -03:00 committed by GitHub
commit d214994b12
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -448,7 +448,7 @@ namespace libtorrent
#endif // TORRENT_NO_DEPRECATE
#ifndef TORRENT_DISABLE_DHT
bool is_dht_running() const { return m_dht; }
bool is_dht_running() const { return m_dht.get(); }
#endif
#if TORRENT_USE_I2P

4
libtorrent/include/libtorrent/i2p_stream.hpp
View File

@ -67,9 +67,9 @@ namespace libtorrent {
struct TORRENT_EXPORT i2p_error_category : boost::system::error_category
{
virtual const char* name() const;
virtual const char* name() const throw();
virtual std::string message(int ev) const;
virtual boost::system::error_condition default_error_condition(int ev) const
virtual boost::system::error_condition default_error_condition(int ev) const throw()
{ return boost::system::error_condition(ev, *this); }
};

4
libtorrent/include/libtorrent/socks5_stream.hpp
View File

@ -65,9 +65,9 @@ typedef asio::error::error_category socks_error_category;
struct TORRENT_EXTRA_EXPORT socks_error_category : boost::system::error_category
{
virtual const char* name() const;
virtual const char* name() const throw();
virtual std::string message(int ev) const;
virtual boost::system::error_condition default_error_condition(int ev) const
virtual boost::system::error_condition default_error_condition(int ev) const throw()
{ return boost::system::error_condition(ev, *this); }
};

2
libtorrent/include/libtorrent/torrent.hpp
View File

@ -888,7 +888,7 @@ namespace libtorrent
, std::string const& private_key
, std::string const& dh_params
, std::string const& passphrase);
bool is_ssl_torrent() const { return m_ssl_ctx; }
bool is_ssl_torrent() const { return m_ssl_ctx.get(); }
boost::asio::ssl::context* ssl_ctx() const { return m_ssl_ctx.get(); }
#endif

4
libtorrent/include/libtorrent/upnp.hpp
View File

@ -80,9 +80,9 @@ namespace libtorrent
struct TORRENT_EXPORT upnp_error_category : boost::system::error_category
{
virtual const char* name() const;
virtual const char* name() const throw();
virtual std::string message(int ev) const;
virtual boost::system::error_condition default_error_condition(int ev) const
virtual boost::system::error_condition default_error_condition(int ev) const throw()
{ return boost::system::error_condition(ev, *this); }
};

2
libtorrent/src/i2p_stream.cpp
View File

@ -45,7 +45,7 @@ namespace libtorrent
i2p_error_category i2p_category;
const char* i2p_error_category::name() const
const char* i2p_error_category::name() const throw()
{
return "i2p error";
}

2
libtorrent/src/socks5_stream.cpp
View File

@ -42,7 +42,7 @@ namespace libtorrent
socks_error_category socks_category;
#if BOOST_VERSION >= 103500
const char* socks_error_category::name() const
const char* socks_error_category::name() const throw()
{
return "socks error";
}

2
libtorrent/src/upnp.cpp
View File

@ -1099,7 +1099,7 @@ namespace
#if BOOST_VERSION >= 103500
const char* upnp_error_category::name() const
const char* upnp_error_category::name() const throw()
{
return "UPnP error";
}