disk_buffer_holder.hpp   disk_buffer_holder.hpp 
skipping to change at line 41 skipping to change at line 41
*/ */
#ifndef TORRENT_DISK_BUFFER_HOLDER_HPP_INCLUDED #ifndef TORRENT_DISK_BUFFER_HOLDER_HPP_INCLUDED
#define TORRENT_DISK_BUFFER_HOLDER_HPP_INCLUDED #define TORRENT_DISK_BUFFER_HOLDER_HPP_INCLUDED
#include "libtorrent/config.hpp" #include "libtorrent/config.hpp"
namespace libtorrent namespace libtorrent
{ {
namespace aux { class session_impl; } namespace aux { struct session_impl; }
class disk_io_thread; struct disk_io_thread;
struct TORRENT_EXPORT disk_buffer_holder struct TORRENT_EXPORT disk_buffer_holder
{ {
disk_buffer_holder(aux::session_impl& ses, char* buf); disk_buffer_holder(aux::session_impl& ses, char* buf);
disk_buffer_holder(disk_io_thread& iothread, char* buf); disk_buffer_holder(disk_io_thread& iothread, char* buf);
~disk_buffer_holder(); ~disk_buffer_holder();
char* release(); char* release();
char* get() const { return m_buf; } char* get() const { return m_buf; }
void reset(char* buf = 0); void reset(char* buf = 0);
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 http_connection.hpp   http_connection.hpp 
skipping to change at line 62 skipping to change at line 62
#ifdef TORRENT_USE_OPENSSL #ifdef TORRENT_USE_OPENSSL
#include "libtorrent/ssl_stream.hpp" #include "libtorrent/ssl_stream.hpp"
#include "libtorrent/variant_stream.hpp" #include "libtorrent/variant_stream.hpp"
#endif #endif
namespace libtorrent namespace libtorrent
{ {
struct http_connection; struct http_connection;
class connection_queue; class connection_queue;
class ip_filter; struct ip_filter;
typedef boost::function<void(error_code const& typedef boost::function<void(error_code const&
, http_parser const&, char const* data, int size, http_connection&)> http_handler; , http_parser const&, char const* data, int size, http_connection&)> http_handler;
typedef boost::function<void(http_connection&)> http_connect_handler; typedef boost::function<void(http_connection&)> http_connect_handler;
// TODO: add bind interface // TODO: add bind interface
// when bottled, the last two arguments to the handler // when bottled, the last two arguments to the handler
// will always be 0 // will always be 0
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 http_tracker_connection.hpp   http_tracker_connection.hpp 
skipping to change at line 60 skipping to change at line 60
#include "libtorrent/config.hpp" #include "libtorrent/config.hpp"
namespace libtorrent namespace libtorrent
{ {
struct http_connection; struct http_connection;
class entry; class entry;
class http_parser; class http_parser;
class connection_queue; class connection_queue;
struct session_settings; struct session_settings;
class ip_filter; struct ip_filter;
class TORRENT_EXPORT http_tracker_connection class TORRENT_EXPORT http_tracker_connection
: public tracker_connection : public tracker_connection
{ {
friend class tracker_manager; friend class tracker_manager;
public: public:
http_tracker_connection( http_tracker_connection(
io_service& ios io_service& ios
, connection_queue& cc , connection_queue& cc
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 ip_filter.hpp   ip_filter.hpp 
skipping to change at line 268 skipping to change at line 268
int access; int access;
}; };
typedef std::set<range> range_t; typedef std::set<range> range_t;
range_t m_access_list; range_t m_access_list;
}; };
} }
class TORRENT_EXPORT ip_filter struct TORRENT_EXPORT ip_filter
{ {
public:
enum access_flags enum access_flags
{ {
blocked = 1 blocked = 1
}; };
// both addresses MUST be of the same type (i.e. both must // both addresses MUST be of the same type (i.e. both must
// be either IPv4 or both must be IPv6) // be either IPv4 or both must be IPv6)
void add_rule(address first, address last, int flags); void add_rule(address first, address last, int flags);
int access(address const& addr) const; int access(address const& addr) const;
 End of changes. 2 change blocks. 
3 lines changed or deleted 1 lines changed or added


 session.hpp   session.hpp 
skipping to change at line 77 skipping to change at line 77
#include "libtorrent/storage.hpp" #include "libtorrent/storage.hpp"
#ifdef _MSC_VER #ifdef _MSC_VER
# include <eh.h> # include <eh.h>
#endif #endif
namespace libtorrent namespace libtorrent
{ {
struct torrent_plugin; struct torrent_plugin;
class torrent; class torrent;
class ip_filter; struct ip_filter;
class port_filter; class port_filter;
class connection_queue; class connection_queue;
class natpmp; class natpmp;
class upnp; class upnp;
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
namespace aux namespace aux
{ {
// workaround for microsofts // workaround for microsofts
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 session_impl.hpp   session_impl.hpp 
skipping to change at line 100 skipping to change at line 100
#endif #endif
namespace libtorrent namespace libtorrent
{ {
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
class peer_connection; class peer_connection;
class upnp; class upnp;
class natpmp; class natpmp;
class lsd; class lsd;
class fingerprint; struct fingerprint;
namespace dht namespace dht
{ {
class dht_tracker; class dht_tracker;
} }
namespace aux namespace aux
{ {
struct session_impl; struct session_impl;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 udp_tracker_connection.hpp   udp_tracker_connection.hpp 
skipping to change at line 62 skipping to change at line 62
#include "libtorrent/udp_socket.hpp" #include "libtorrent/udp_socket.hpp"
#include "libtorrent/entry.hpp" #include "libtorrent/entry.hpp"
#include "libtorrent/session_settings.hpp" #include "libtorrent/session_settings.hpp"
#include "libtorrent/peer_id.hpp" #include "libtorrent/peer_id.hpp"
#include "libtorrent/peer.hpp" #include "libtorrent/peer.hpp"
#include "libtorrent/tracker_manager.hpp" #include "libtorrent/tracker_manager.hpp"
#include "libtorrent/config.hpp" #include "libtorrent/config.hpp"
namespace libtorrent namespace libtorrent
{ {
class ip_filter; struct ip_filter;
class TORRENT_EXPORT udp_tracker_connection: public tracker_connecti on class TORRENT_EXPORT udp_tracker_connection: public tracker_connecti on
{ {
friend class tracker_manager; friend class tracker_manager;
public: public:
udp_tracker_connection( udp_tracker_connection(
io_service& ios io_service& ios
, connection_queue& cc , connection_queue& cc
, tracker_manager& man , tracker_manager& man
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 14 #define LIBTORRENT_VERSION_MINOR 14
#define LIBTORRENT_VERSION_TINY 11 #define LIBTORRENT_VERSION_TINY 12
#define LIBTORRENT_VERSION "0.14.11.0" #define LIBTORRENT_VERSION "0.14.12.0"
#define LIBTORRENT_REVISION "$Rev: 4759 $" #define LIBTORRENT_REVISION "$Rev: 4828 $"
#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/