Browse Source

quick fix for #387

miguelfreitas
erqan 8 years ago
parent
commit
dd4f5a1769
  1. 2
      libtorrent/include/libtorrent/aux_/session_impl.hpp
  2. 4
      libtorrent/include/libtorrent/i2p_stream.hpp
  3. 4
      libtorrent/include/libtorrent/socks5_stream.hpp
  4. 2
      libtorrent/include/libtorrent/torrent.hpp
  5. 4
      libtorrent/include/libtorrent/upnp.hpp
  6. 2
      libtorrent/src/i2p_stream.cpp
  7. 2
      libtorrent/src/socks5_stream.cpp
  8. 2
      libtorrent/src/upnp.cpp

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

@ -448,7 +448,7 @@ namespace libtorrent @@ -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

@ -67,9 +67,9 @@ namespace libtorrent { @@ -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

@ -65,9 +65,9 @@ typedef asio::error::error_category socks_error_category; @@ -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

@ -888,7 +888,7 @@ namespace libtorrent @@ -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

@ -80,9 +80,9 @@ namespace libtorrent @@ -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

@ -45,7 +45,7 @@ namespace libtorrent @@ -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

@ -42,7 +42,7 @@ namespace libtorrent @@ -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

@ -1099,7 +1099,7 @@ namespace @@ -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";
}

Loading…
Cancel
Save