[Libtorrent-commits] SF.net SVN: libtorrent:[10926] trunk

[<ar...@us...>]

Revision: 10926
          http://sourceforge.net/p/libtorrent/code/10926
Author:   arvidn
Date:     2015-03-31 22:27:32 +0000 (Tue, 31 Mar 2015)
Log Message:
-----------
merged changes from RC_1_0

Modified Paths:
--------------
    trunk/docs/python_binding.rst
    trunk/include/libtorrent/udp_socket.hpp

Property Changed:
----------------
    trunk/

Index: trunk
===================================================================
--- trunk	2015-03-31 22:18:23 UTC (rev 10925)
+++ trunk	2015-03-31 22:27:32 UTC (rev 10926)

Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
 /branches/RC_0_16:6640,6657,6662,6665,6669,6673-6675,6678,6684,6686,6688,6690,6692,6694-6695,6698,6700,6715,6936,6938,6946,6951,6956,6971,6974,6976,6979,7166,7200,7206,7258,7311,7314,7323,7333,7339,7348,7358,7371,7373,7375,7379,7395,7422,7433,7458,7461,7464,7466,7469,7471,7473,7480,7482,7487,7489,7492-7493,7497,7500,7507,7511,7514,7529,7536,7542,7546,7548-7549,7551,7553,7555,7560-7561,7564,7572,7577,7579,7587,7593-7594,7598-7599,7609,7611,7623-7624,7627,7633,7642,7644,7651,7667,7671,7675,7677,7681,7683,7685,7694,7699,7701,7704-7706,7711,7719,7729,7739,7752,7758,7760,7762,7765,7767,7771,7773,7784,7786,7788,7809,7814,7826,7828,7834,7838,7840,7847,7851,7853,7863-7864,7868,7870,7875,7884,7886,7890,7902,7905-7906,7909,7912,7914-7915,7925,7928,7930,7932,7934,7941,7947,7951,7955,7962,7964,7966,7971,7973,7984,7986,7988,7999,8002-8003,8005,8010,8012,8015,8017,8019,8021,8025,8041,8050,8066,8080,8082,8087,8091,8111,8130,8144,8171,8216,8221,8229,8235,8251,8288,8303,8331,8333,8340,8342,8345,8348,8357,8359-8361,8363,8371,8375,8382,8391,8393,8397,8399-8401,8416,8423,8426,8429,8431,8433,8436,8439,8445,8448,8452,8460,8462,8464,8466,8536,8564,8577,8580,8584,8587,8591,8605-8606,8612,8615,8619,8682,8693-8694,8696,8698,8700,8702,8704,8730,8732-8734,8760,8776-8777,8786,8797,8800,8815,8824,8826,8869,8884,8887,8917,8921-8922,8934,8936,8938,8943,8966,8971,8981-8982,8992,8994,8997,9000,9032-9033,9037,9046,9122,9127,9132,9154,9197,9204,9224,9232,9235,9237,9240,9253-9254,9260,9266-9267,9273,9285,9291,9294-9295,9297,9300,9333,9341,9343,9345,9347,9377,9408,9410,9414,9453,9480,9482,9487,9514,9520,9526,9530,9540,9543,9584,9616,9620,9627,9635,9652,9654,9661,9664,9684,9686,9691,9710,9716,9722,9729,9731,9738,9744,9752,9762,9766-9767,9772,9776,9779,9799,9805,9822,9826,9870,9872,9882,9889,9892,9894,9897,9947,9955,9994,10012,10017,10025,10134,10186,10189,10192,10195,10210,10214,10220,10223,10261,10289,10325,10338,10341,10344,10348,10391,10467,10576,10625,10629,10641
-/branches/RC_1_0:10069-10901
+/branches/RC_1_0:10069-10925
 /branches/bdecoder:10825-10866
 /branches/libtorrent_aio:4468-10083
 /branches/libtorrent_aio_arc:6324-6529
\ No newline at end of property
Modified: trunk/docs/python_binding.rst
===================================================================
--- trunk/docs/python_binding.rst	2015-03-31 22:18:23 UTC (rev 10925)
+++ trunk/docs/python_binding.rst	2015-03-31 22:27:32 UTC (rev 10926)
@@ -122,7 +122,7 @@
 	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)

Modified: trunk/include/libtorrent/udp_socket.hpp
===================================================================
--- trunk/include/libtorrent/udp_socket.hpp	2015-03-31 22:18:23 UTC (rev 10925)
+++ trunk/include/libtorrent/udp_socket.hpp	2015-03-31 22:27:32 UTC (rev 10926)
@@ -156,6 +156,10 @@
 
 	private:
 
+		// non-copyable
+		udp_socket(udp_socket const&);
+		udp_socket& operator=(udp_socket const&);
+
 		// observers on this udp socket
 		std::vector<udp_socket_observer*> m_observers;
 		std::vector<udp_socket_observer*> m_added_observers;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.