From 7eb9812cfa124536449c4833f3006c41d6377dac Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Wed, 11 Jan 2006 01:32:26 +0000 Subject: [PATCH] changed include order of boost headers to workaround namespace bug on msvc 7 --- include/libtorrent/debug.hpp | 1 + include/libtorrent/peer_connection.hpp | 3 ++- src/piece_picker.cpp | 2 +- src/policy.cpp | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/libtorrent/debug.hpp b/include/libtorrent/debug.hpp index 19d196e90..71f849bce 100755 --- a/include/libtorrent/debug.hpp +++ b/include/libtorrent/debug.hpp @@ -35,6 +35,7 @@ POSSIBILITY OF SUCH DAMAGE. #include #include +#include #ifdef _MSC_VER #pragma warning(push, 1) diff --git a/include/libtorrent/peer_connection.hpp b/include/libtorrent/peer_connection.hpp index c422fee60..ff428f7ae 100755 --- a/include/libtorrent/peer_connection.hpp +++ b/include/libtorrent/peer_connection.hpp @@ -39,6 +39,8 @@ POSSIBILITY OF SUCH DAMAGE. #include #include +#include "libtorrent/debug.hpp" + #ifdef _MSC_VER #pragma warning(push, 1) #endif @@ -59,7 +61,6 @@ POSSIBILITY OF SUCH DAMAGE. #include "libtorrent/peer_id.hpp" #include "libtorrent/storage.hpp" #include "libtorrent/stat.hpp" -#include "libtorrent/debug.hpp" #include "libtorrent/alert.hpp" #include "libtorrent/torrent_handle.hpp" #include "libtorrent/torrent.hpp" diff --git a/src/piece_picker.cpp b/src/piece_picker.cpp index 6d7b78998..e25b44a50 100755 --- a/src/piece_picker.cpp +++ b/src/piece_picker.cpp @@ -38,8 +38,8 @@ POSSIBILITY OF SUCH DAMAGE. #include "libtorrent/piece_picker.hpp" #ifndef NDEBUG -#include "libtorrent/torrent.hpp" #include "libtorrent/peer_connection.hpp" +#include "libtorrent/torrent.hpp" #endif namespace libtorrent diff --git a/src/policy.cpp b/src/policy.cpp index d0f8a5578..a75e7bea4 100755 --- a/src/policy.cpp +++ b/src/policy.cpp @@ -32,6 +32,8 @@ POSSIBILITY OF SUCH DAMAGE. #include +#include "libtorrent/peer_connection.hpp" + #ifdef _MSC_VER #pragma warning(push, 1) #endif @@ -46,7 +48,6 @@ POSSIBILITY OF SUCH DAMAGE. #include "libtorrent/policy.hpp" #include "libtorrent/torrent.hpp" #include "libtorrent/socket.hpp" -#include "libtorrent/peer_connection.hpp" #include "libtorrent/alert_types.hpp" #include "libtorrent/invariant_check.hpp"