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

fix merge issue in python binding

This commit is contained in:
Arvid Norberg 2014-11-20 02:35:19 +00:00
parent 3f61ee0ff3
commit fddb25308b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bindings/python/src/torrent_info.cpp
View File

@ -177,20 +177,20 @@ namespace
} // namespace unnamed
boost::intrusive_ptr<torrent_info> buffer_constructor(char const* buf, int len, int flags)
boost::shared_ptr<torrent_info> buffer_constructor(char const* buf, int len, int flags)
{
error_code ec;
boost::intrusive_ptr<torrent_info> ret(new torrent_info(buf, len, ec, flags));
boost::shared_ptr<torrent_info> ret(new torrent_info(buf, len, ec, flags));
#ifndef BOOST_NO_EXCEPTIONS
if (ec) throw libtorrent_exception(ec);
#endif
return ret;
}
boost::intrusive_ptr<torrent_info> file_constructor(std::string const& filename, int flags)
boost::shared_ptr<torrent_info> file_constructor(std::string const& filename, int flags)
{
error_code ec;
boost::intrusive_ptr<torrent_info> ret(new torrent_info(filename, ec, flags));
boost::shared_ptr<torrent_info> ret(new torrent_info(filename, ec, flags));
#ifndef BOOST_NO_EXCEPTIONS
if (ec) throw libtorrent_exception(ec);
#endif