From 614d459f877d34a6f19ed83abe132a6de552989d Mon Sep 17 00:00:00 2001 From: Magnus Jonsson Date: Fri, 16 Jan 2004 02:38:19 +0000 Subject: [PATCH] *** empty log message *** --- include/libtorrent/entry.hpp | 12 +++--------- include/libtorrent/storage.hpp | 5 +++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/include/libtorrent/entry.hpp b/include/libtorrent/entry.hpp index 3df30aa35..40d224c26 100755 --- a/include/libtorrent/entry.hpp +++ b/include/libtorrent/entry.hpp @@ -65,6 +65,7 @@ POSSIBILITY OF SUCH DAMAGE. #include #include #include +#include namespace libtorrent { @@ -108,15 +109,8 @@ namespace libtorrent typedef std::map dictionary_type; typedef std::string string_type; typedef std::vector list_type; -#if defined(_MSC_VER) && _MSC_VER >= 1300 - typedef __int64 integer_type; -#elif defined(_MSC_VER) - typedef int integer_type; -#elif defined(__GNUC__) - typedef long long integer_type; -#else - typedef long integer_type; -#endif + + typedef boost::int64_t integer_type; enum data_type { diff --git a/include/libtorrent/storage.hpp b/include/libtorrent/storage.hpp index 9680c3423..9e094e461 100755 --- a/include/libtorrent/storage.hpp +++ b/include/libtorrent/storage.hpp @@ -38,6 +38,7 @@ POSSIBILITY OF SUCH DAMAGE. #include #include #include +#include #include "libtorrent/entry.hpp" #include "libtorrent/torrent_info.hpp" @@ -68,7 +69,7 @@ namespace libtorrent void swap(storage&); - typedef entry::integer_type size_type; + typedef boost::int64_t size_type; size_type read(char* buf, int slot, size_type offset, size_type size); void write(const char* buf, int slot, size_type offset, size_type size); @@ -81,7 +82,7 @@ namespace libtorrent class piece_manager : boost::noncopyable { public: - typedef entry::integer_type size_type; + typedef boost::int64_t size_type; piece_manager( const torrent_info& info