add typedefs for shared_ptr and make_shared, to make transition to 1.2 easier

This commit is contained in:
arvidn 2017-01-17 19:42:49 -05:00 committed by Arvid Norberg
parent 3763a47846
commit 61c057947c
2 changed files with 6 additions and 2 deletions

View File

@ -884,7 +884,7 @@ namespace libtorrent
#endif
#ifdef TORRENT_USE_OPENSSL
ssl::context* ssl_ctx() { return &m_ssl_ctx; }
ssl::context* ssl_ctx() TORRENT_OVERRIDE { return &m_ssl_ctx; }
void on_incoming_utp_ssl(boost::shared_ptr<socket_type> const& s);
void ssl_handshake(error_code const& ec, boost::shared_ptr<socket_type> s);
#endif

View File

@ -41,6 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include <set>
#include <boost/shared_ptr.hpp>
#include <boost/make_shared.hpp>
#include <boost/function.hpp>
#include <boost/weak_ptr.hpp>
#include <boost/cstdint.hpp>
@ -82,6 +83,9 @@ namespace libtorrent
void throw_invalid_handle() TORRENT_NO_RETURN;
#endif
using boost::shared_ptr;
using boost::make_shared;
// holds the state of a block in a piece. Who we requested
// it from and how far along we are at downloading it.
struct TORRENT_EXPORT block_info
@ -896,7 +900,7 @@ namespace libtorrent
// without metadata only if it was started without a .torrent file, e.g.
// by using the libtorrent extension of just supplying a tracker and
// info-hash.
boost::shared_ptr<const torrent_info> torrent_file() const;
shared_ptr<const torrent_info> torrent_file() const;
#ifndef TORRENT_NO_DEPRECATE