From 711838792621aa782432bf2ff766b32188d90cab Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Tue, 31 Mar 2015 22:27:32 +0000 Subject: [PATCH] merged changes from RC_1_0 --- docs/python_binding.rst | 2 +- include/libtorrent/udp_socket.hpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/python_binding.rst b/docs/python_binding.rst index c7dcafbdd..a3c12adb1 100644 --- a/docs/python_binding.rst +++ b/docs/python_binding.rst @@ -122,7 +122,7 @@ A very simple example usage of the module would be something like this:: e = lt.bdecode(open("test.torrent", 'rb').read()) info = lt.torrent_info(e) - params = { save_path: './', \ + params = { save_path: '.', \ storage_mode: lt.storage_mode_t.storage_mode_sparse, \ ti: info } h = ses.add_torrent(params) diff --git a/include/libtorrent/udp_socket.hpp b/include/libtorrent/udp_socket.hpp index 83cbcbcf2..fb8821738 100644 --- a/include/libtorrent/udp_socket.hpp +++ b/include/libtorrent/udp_socket.hpp @@ -156,6 +156,10 @@ namespace libtorrent private: + // non-copyable + udp_socket(udp_socket const&); + udp_socket& operator=(udp_socket const&); + // observers on this udp socket std::vector m_observers; std::vector m_added_observers;