fix some build warnings in python binding

bindings/python/Makefile.am

@@ -21,6 +21,7 @@ EXTRA_DIST = \
   src/module.cpp            \
   src/optional.hpp          \
   src/peer_info.cpp         \
+  src/boost_python.hpp      \
   src/session.cpp           \
   src/session_settings.cpp  \
   src/string.cpp            \

bindings/python/src/alert.cpp

@@ -2,7 +2,7 @@
 // subject to the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/python.hpp>
+#include "boost_python.hpp"
 #include <libtorrent/alert.hpp>
 #include <libtorrent/alert_types.hpp>
 #include <libtorrent/piece_picker.hpp> // for piece_block

bindings/python/src/big_number.cpp

@@ -3,7 +3,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <libtorrent/sha1_hash.hpp>
-#include <boost/python.hpp>
+#include "boost_python.hpp"
 #include "bytes.hpp"
 
 long get_hash(boost::python::object o)

bindings/python/src/boost_python.hpp

@@ -0,0 +1,13 @@
+// Copyright Daniel Wallin 2006. Use, modification and distribution is
+// subject to the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_PYTHON_HPP
+#define BOOST_PYTHON_HPP
+
+#include <libtorrent/aux_/disable_warnings_push.hpp>
+#include <boost/python.hpp>
+#include <libtorrent/aux_/disable_warnings_pop.hpp>
+
+#endif
+

bindings/python/src/bytes.hpp

@@ -9,16 +9,16 @@
 
 struct bytes
 {
-    bytes(char const* s, int len): arr(s, len) {}
+	bytes(char const* s, int len): arr(s, len) {}
-    bytes(std::string const& s): arr(s) {}
+	bytes(std::string const& s): arr(s) {}
 #if __cplusplus >= 201103L
-    bytes(std::string&& s): arr(std::move(s)) {}
+	bytes(std::string&& s): arr(std::move(s)) {}
-    bytes(bytes const&) = default;
+	bytes(bytes const&) = default;
-    bytes(bytes&&) = default;
+	bytes(bytes&&) = default;
-    bytes& operator=(bytes&&) = default;
+	bytes& operator=(bytes&&) = default;
 #endif
-    bytes() {}
+	bytes() {}
-    std::string arr;
+	std::string arr;
 };
 
 #endif

bindings/python/src/converters.cpp

@@ -2,7 +2,7 @@
 // subject to the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/python.hpp>
+#include "boost_python.hpp"
 
 using namespace boost::python;
 

bindings/python/src/create_torrent.cpp

@@ -2,7 +2,7 @@
 // subject to the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/python.hpp>
+#include "boost_python.hpp"
 #include <libtorrent/create_torrent.hpp>
 #include <libtorrent/file_storage.hpp>
 #include "libtorrent/torrent_info.hpp"

bindings/python/src/datetime.cpp

@@ -2,7 +2,7 @@
 // subject to the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/python.hpp>
+#include "boost_python.hpp"
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 #include "optional.hpp"
 #include <boost/version.hpp>

bindings/python/src/entry.cpp

@@ -2,7 +2,7 @@
 // subject to the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/python.hpp>
+#include "boost_python.hpp"
 #include <libtorrent/session.hpp>
 #include "bytes.hpp"
 

bindings/python/src/error_code.cpp

@@ -34,7 +34,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <libtorrent/bdecode.hpp>
 #include <libtorrent/upnp.hpp>
 #include <libtorrent/socks5_stream.hpp>
-#include <boost/python.hpp>
+#include "boost_python.hpp"
 
 using namespace boost::python;
 using namespace libtorrent;

bindings/python/src/fingerprint.cpp

@@ -3,12 +3,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <libtorrent/fingerprint.hpp>
-
+#include "boost_python.hpp"
-#include <libtorrent/aux_/disable_warnings_push.hpp>
-
-#include <boost/python.hpp>
-
-#include <libtorrent/aux_/disable_warnings_pop.hpp>
 
 void bind_fingerprint()
 {

bindings/python/src/ip_filter.cpp

@@ -3,7 +3,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <libtorrent/ip_filter.hpp>
-#include <boost/python.hpp>
+#include "boost_python.hpp"
 #include "gil.hpp"
 
 using namespace boost::python;

bindings/python/src/magnet_uri.cpp

@@ -2,7 +2,7 @@
 // subject to the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
 
-#include <boost/python.hpp>
+#include "boost_python.hpp"
 #include <libtorrent/session.hpp>
 #include <libtorrent/torrent.hpp>
 #include <libtorrent/magnet_uri.hpp>
@@ -17,23 +17,23 @@ extern void dict_to_add_torrent_params(dict params, add_torrent_params& p);
 namespace {
 
 #ifndef TORRENT_NO_DEPRECATE
-    torrent_handle _add_magnet_uri(lt::session& s, std::string uri, dict params)
+	torrent_handle _add_magnet_uri(lt::session& s, std::string uri, dict params)
-    {
+	{
-        add_torrent_params p;
+		add_torrent_params p;
 
-        dict_to_add_torrent_params(params, p);
+		dict_to_add_torrent_params(params, p);
 
-        allow_threading_guard guard;
+		allow_threading_guard guard;
 
-		  p.url = uri;
+		p.url = uri;
 
 #ifndef BOOST_NO_EXCEPTIONS
-        return s.add_torrent(p);
+		return s.add_torrent(p);
 #else
-        error_code ec;
+		error_code ec;
-        return s.add_torrent(p, ec);
+		return s.add_torrent(p, ec);
 #endif
-    }
+	}
 #endif
 
 	dict parse_magnet_uri_wrap(std::string const& uri)
@@ -76,10 +76,10 @@ namespace {
 void bind_magnet_uri()
 {
 #ifndef TORRENT_NO_DEPRECATE
-    def("add_magnet_uri", &_add_magnet_uri);
+	def("add_magnet_uri", &_add_magnet_uri);
 #endif
-    def("make_magnet_uri", make_magnet_uri0);
+	def("make_magnet_uri", make_magnet_uri0);
-    def("make_magnet_uri", make_magnet_uri1);
+	def("make_magnet_uri", make_magnet_uri1);
-    def("parse_magnet_uri", parse_magnet_uri_wrap);
+	def("parse_magnet_uri", parse_magnet_uri_wrap);
 }
 

bindings/python/src/optional.hpp

@@ -5,7 +5,7 @@
 #ifndef OPTIONAL_070108_HPP
 # define OPTIONAL_070108_HPP
 
-# include <boost/python.hpp>
+# include "boost_python.hpp"
 # include <boost/optional.hpp>
 
 template <class T>

bindings/python/src/peer_info.cpp

@@ -4,7 +4,7 @@
 
 #include <libtorrent/peer_info.hpp>
 #include <libtorrent/bitfield.hpp>
-#include <boost/python.hpp>
+#include "boost_python.hpp"
 #include <boost/python/iterator.hpp>
 
 using namespace boost::python;

bindings/python/src/session.cpp

@@ -28,7 +28,7 @@
 
 #include "libtorrent/aux_/disable_warnings_push.hpp"
 
-#include <boost/python.hpp>
+#include "boost_python.hpp"
 
 #include "libtorrent/aux_/disable_warnings_pop.hpp"
 

bindings/python/src/session_settings.cpp

@@ -2,7 +2,7 @@
 // subject to the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/python.hpp>
+#include "boost_python.hpp"
 #include <libtorrent/session.hpp>
 
 using namespace boost::python;

bindings/python/src/string.cpp

@@ -2,7 +2,7 @@
 // subject to the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/python.hpp>
+#include "boost_python.hpp"
 #include <string>
 
 using namespace boost::python;

bindings/python/src/torrent_handle.cpp

@@ -2,7 +2,7 @@
 // subject to the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/python.hpp>
+#include "boost_python.hpp"
 #include <boost/python/tuple.hpp>
 #include <boost/python/stl_iterator.hpp>
 #include <libtorrent/torrent_handle.hpp>

bindings/python/src/torrent_info.cpp

@@ -4,7 +4,7 @@
 
 #include "libtorrent/aux_/disable_warnings_push.hpp"
 
-#include <boost/python.hpp>
+#include "boost_python.hpp"
 #include <boost/shared_ptr.hpp>
 
 #include "libtorrent/aux_/disable_warnings_pop.hpp"

bindings/python/src/torrent_status.cpp

@@ -2,7 +2,7 @@
 // subject to the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/python.hpp>
+#include "boost_python.hpp"
 #include <libtorrent/torrent_status.hpp>
 #include <libtorrent/torrent_info.hpp>
 #include <libtorrent/bitfield.hpp>

bindings/python/src/utility.cpp

@@ -4,7 +4,7 @@
 
 #include <libtorrent/identify_client.hpp>
 #include <libtorrent/bencode.hpp>
-#include <boost/python.hpp>
+#include "boost_python.hpp"
 #include "bytes.hpp"
 
 using namespace boost::python;

bindings/python/src/version.cpp

@@ -3,7 +3,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <libtorrent/version.hpp>
-#include <boost/python.hpp>
+#include "boost_python.hpp"
 
 using namespace boost::python;
 using libtorrent::version;

include/libtorrent/bandwidth_limit.hpp

@@ -33,9 +33,13 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_BANDWIDTH_CHANNEL_HPP_INCLUDED
 #define TORRENT_BANDWIDTH_CHANNEL_HPP_INCLUDED
 
+#include "libtorrent/aux_/disable_warnings_push.hpp"
+
 #include <boost/integer_traits.hpp>
 #include <boost/cstdint.hpp>
 
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
+
 #include "libtorrent/assert.hpp"
 
 namespace libtorrent {

include/libtorrent/hasher.hpp

@@ -33,12 +33,16 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_HASHER_HPP_INCLUDED
 #define TORRENT_HASHER_HPP_INCLUDED
 
-#include <boost/cstdint.hpp>
-
 #include "libtorrent/peer_id.hpp"
 #include "libtorrent/config.hpp"
 #include "libtorrent/assert.hpp"
 
+#include "libtorrent/aux_/disable_warnings_push.hpp"
+
+#include <boost/cstdint.hpp>
+
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
+
 #ifdef TORRENT_USE_GCRYPT
 #include <gcrypt.h>
 

include/libtorrent/io.hpp

@@ -33,7 +33,10 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_IO_HPP_INCLUDED
 #define TORRENT_IO_HPP_INCLUDED
 
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 #include <boost/cstdint.hpp>
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
+
 #include <string>
 #include <algorithm> // for copy
 #include <cstring> // for memcpy

src/bandwidth_queue_entry.cpp

@@ -30,7 +30,12 @@ POSSIBILITY OF SUCH DAMAGE.
 
 */
 
+#include "libtorrent/aux_/disable_warnings_push.hpp"
+
 #include <boost/cstdint.hpp>
+
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
+
 #include "libtorrent/bandwidth_queue_entry.hpp"
 #include <cstring>
 #include <algorithm>