premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

boost 1.35 related fixes

This commit is contained in:
Arvid Norberg 2008-05-20 09:45:55 +00:00
parent 67354421fb
commit 31ab7f9773
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Jamfile
View File

@ -338,6 +338,7 @@ ZLIB_SOURCES =
local usage-requirements =
<include>./include
<include>./include/libtorrent
<zlib>shipped:<include>./zlib
<variant>release:<define>NDEBUG
<define>_FILE_OFFSET_BITS=64

2
include/libtorrent/socket.hpp
View File

@ -45,6 +45,8 @@ POSSIBILITY OF SUCH DAMAGE.
#define Protocol Protocol_
#endif
#include <boost/version.hpp>
#if BOOST_VERSION < 103500
#include <asio/ip/tcp.hpp>
#include <asio/ip/udp.hpp>

5
include/libtorrent/time.hpp
View File

@ -34,6 +34,7 @@ POSSIBILITY OF SUCH DAMAGE.
#define TORRENT_TIME_HPP_INCLUDED
#include <ctime>
#include <boost/version.hpp>
#ifndef _WIN32
#include <unistd.h>
@ -156,7 +157,7 @@ namespace libtorrent
}
// asio time_traits
#if BOOST_VERSION < 103500
#if BOOST_VERSION >= 103500
namespace boost {
#endif
namespace asio
@ -179,7 +180,7 @@ namespace asio
{ return boost::posix_time::microseconds(libtorrent::total_microseconds(d)); }
};
}
#if BOOST_VERSION < 103500
#if BOOST_VERSION >= 103500
}
#endif

2
src/broadcast_socket.cpp
View File

@ -30,6 +30,8 @@ POSSIBILITY OF SUCH DAMAGE.
*/
#include <boost/version.hpp>
#if BOOST_VERSION < 103500
#include <asio/ip/host_name.hpp>
#include <asio/ip/multicast.hpp>

8
src/mapped_storage.cpp
View File

@ -64,7 +64,9 @@ namespace libtorrent
{
namespace fs = boost::filesystem;
#if BOOST_VERSION >= 103500
using boost::system::error_code;
typedef boost::system::error_code ec_t;
#else
typedef error_code ec_t;
#endif
struct mapped_file_pool
@ -85,7 +87,7 @@ namespace libtorrent
#ifndef NDEBUG
if (file_size > 0)
{
error_code ec;
ec_t ec;
fs::file_status st = fs::status(path, ec);
TORRENT_ASSERT(!fs::exists(st));
}
@ -207,7 +209,7 @@ namespace libtorrent
#if BOOST_VERSION < 103500
fs::system_error_type ec;
#else
error_code ec;
ec_t ec;
#endif
fs::file_status st = fs::status(p, ec);