error_code.hpp   error_code.hpp 
skipping to change at line 321 skipping to change at line 321
#endif #endif
namespace libtorrent namespace libtorrent
{ {
#if BOOST_VERSION < 103500 #if BOOST_VERSION < 103500
typedef asio::error_code error_code; typedef asio::error_code error_code;
inline asio::error::error_category get_posix_category() { return asi o::error::system_category; } inline asio::error::error_category get_posix_category() { return asi o::error::system_category; }
inline asio::error::error_category get_system_category() { return as io::error::system_category; } inline asio::error::error_category get_system_category() { return as io::error::system_category; }
boost::system::error_category const& get_libtorrent_category() inline boost::system::error_category const& get_libtorrent_category( )
{ {
static ::asio::error::error_category libtorrent_category(20) ; static ::asio::error::error_category libtorrent_category(20) ;
return libtorrent_category; return libtorrent_category;
} }
boost::system::error_category const& get_http_category() inline boost::system::error_category const& get_http_category()
{ {
static ::asio::error::error_category http_category(21); static ::asio::error::error_category http_category(21);
return http_category; return http_category;
} }
#else #else
struct TORRENT_EXPORT libtorrent_error_category : boost::system::err or_category struct TORRENT_EXPORT libtorrent_error_category : boost::system::err or_category
{ {
virtual const char* name() const BOOST_SYSTEM_NOEXCEPT; virtual const char* name() const BOOST_SYSTEM_NOEXCEPT;
virtual std::string message(int ev) const BOOST_SYSTEM_NOEXC EPT; virtual std::string message(int ev) const BOOST_SYSTEM_NOEXC EPT;
virtual boost::system::error_condition default_error_conditi on(int ev) const BOOST_SYSTEM_NOEXCEPT virtual boost::system::error_condition default_error_conditi on(int ev) const BOOST_SYSTEM_NOEXCEPT
{ return boost::system::error_condition(ev, *this); } { return boost::system::error_condition(ev, *this); }
}; };
inline boost::system::error_category& get_libtorrent_category() TORRENT_EXPORT boost::system::error_category& get_libtorrent_categor
{ y();
static libtorrent_error_category libtorrent_category;
return libtorrent_category;
}
struct TORRENT_EXPORT http_error_category : boost::system::error_cat egory struct TORRENT_EXPORT http_error_category : boost::system::error_cat egory
{ {
virtual const char* name() const BOOST_SYSTEM_NOEXCEPT; virtual const char* name() const BOOST_SYSTEM_NOEXCEPT;
virtual std::string message(int ev) const BOOST_SYSTEM_NOEXC EPT; virtual std::string message(int ev) const BOOST_SYSTEM_NOEXC EPT;
virtual boost::system::error_condition default_error_conditi on(int ev) const BOOST_SYSTEM_NOEXCEPT virtual boost::system::error_condition default_error_conditi on(int ev) const BOOST_SYSTEM_NOEXCEPT
{ return boost::system::error_condition(ev, *this); } { return boost::system::error_condition(ev, *this); }
}; };
inline boost::system::error_category& get_http_category() TORRENT_EXPORT boost::system::error_category& get_http_category();
{
static http_error_category http_category;
return http_category;
}
namespace errors namespace errors
{ {
inline boost::system::error_code make_error_code(error_code_ enum e) inline boost::system::error_code make_error_code(error_code_ enum e)
{ {
return boost::system::error_code(e, get_libtorrent_c ategory()); return boost::system::error_code(e, get_libtorrent_c ategory());
} }
} }
using boost::system::error_code; using boost::system::error_code;
 End of changes. 4 change blocks. 
12 lines changed or deleted 5 lines changed or added


 lazy_entry.hpp   lazy_entry.hpp 
skipping to change at line 163 skipping to change at line 163
m_size = 0; m_size = 0;
m_capacity = 0; m_capacity = 0;
m_begin = begin; m_begin = begin;
} }
lazy_entry* dict_append(char const* name); lazy_entry* dict_append(char const* name);
void pop(); void pop();
lazy_entry* dict_find(char const* name); lazy_entry* dict_find(char const* name);
lazy_entry const* dict_find(char const* name) const lazy_entry const* dict_find(char const* name) const
{ return const_cast<lazy_entry*>(this)->dict_find(name); } { return const_cast<lazy_entry*>(this)->dict_find(name); }
lazy_entry* dict_find(std::string const& name);
lazy_entry const* dict_find(std::string const& name) const
{ return const_cast<lazy_entry*>(this)->dict_find(name); }
std::string dict_find_string_value(char const* name) const; std::string dict_find_string_value(char const* name) const;
pascal_string dict_find_pstr(char const* name) const; pascal_string dict_find_pstr(char const* name) const;
size_type dict_find_int_value(char const* name, size_type de fault_val = 0) const; size_type dict_find_int_value(char const* name, size_type de fault_val = 0) const;
lazy_entry const* dict_find_dict(char const* name) const; lazy_entry const* dict_find_dict(char const* name) const;
lazy_entry const* dict_find_dict(std::string const& name) co nst;
lazy_entry const* dict_find_list(char const* name) const; lazy_entry const* dict_find_list(char const* name) const;
lazy_entry const* dict_find_string(char const* name) const; lazy_entry const* dict_find_string(char const* name) const;
lazy_entry const* dict_find_int(char const* name) const; lazy_entry const* dict_find_int(char const* name) const;
std::pair<std::string, lazy_entry const*> dict_at(int i) con st; std::pair<std::string, lazy_entry const*> dict_at(int i) con st;
int dict_size() const int dict_size() const
{ {
TORRENT_ASSERT(m_type == dict_t); TORRENT_ASSERT(m_type == dict_t);
return m_size; return m_size;
 End of changes. 2 change blocks. 
0 lines changed or deleted 4 lines changed or added


 random.hpp   random.hpp 
#include "libtorrent/config.hpp"
#include <boost/cstdint.hpp> #include <boost/cstdint.hpp>
namespace libtorrent namespace libtorrent
{ {
void random_seed(boost::uint32_t v); TORRENT_EXTRA_EXPORT void random_seed(boost::uint32_t v);
boost::uint32_t random(); boost::uint32_t random();
} }
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 version.hpp   version.hpp 
skipping to change at line 38 skipping to change at line 38
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef TORRENT_VERSION_HPP_INCLUDED #ifndef TORRENT_VERSION_HPP_INCLUDED
#define TORRENT_VERSION_HPP_INCLUDED #define TORRENT_VERSION_HPP_INCLUDED
#define LIBTORRENT_VERSION_MAJOR 0 #define LIBTORRENT_VERSION_MAJOR 0
#define LIBTORRENT_VERSION_MINOR 16 #define LIBTORRENT_VERSION_MINOR 16
#define LIBTORRENT_VERSION_TINY 18 #define LIBTORRENT_VERSION_TINY 19
// the format of this version is: MMmmtt // the format of this version is: MMmmtt
// M = Major version, m = minor version, t = tiny version // M = Major version, m = minor version, t = tiny version
#define LIBTORRENT_VERSION_NUM ((LIBTORRENT_VERSION_MAJOR * 10000) + (LIBTO RRENT_VERSION_MINOR * 100) + LIBTORRENT_VERSION_TINY) #define LIBTORRENT_VERSION_NUM ((LIBTORRENT_VERSION_MAJOR * 10000) + (LIBTO RRENT_VERSION_MINOR * 100) + LIBTORRENT_VERSION_TINY)
#define LIBTORRENT_VERSION "0.16.18.0" #define LIBTORRENT_VERSION "0.16.19.0"
#define LIBTORRENT_REVISION "$Rev: 10283 $" #define LIBTORRENT_REVISION "$Rev: 10584 $"
#endif #endif
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/