forked from premiere/premiere-libtorrent
minor changes, typos and gcc tests in windows (#947)
minor changes, typos and gcc tests in windows
This commit is contained in:
parent
7fdab0d9e9
commit
9af2072bc9
|
@ -99,10 +99,8 @@ build_script:
|
||||||
|
|
||||||
test_script:
|
test_script:
|
||||||
- cd %ROOT_DIRECTORY%\test
|
- cd %ROOT_DIRECTORY%\test
|
||||||
# mingw tests crash currently. needs resolving
|
- b2.exe -l400 --hash warnings-as-errors=on -j2 %compiler% address-model=%model% debug-iterators=on picker-debugging=on invariant-checks=full variant=%variant% %linkflags% %include% link=shared ssl=%ssl% crypto=%crypto% win-tests
|
||||||
- if not %compiler% == gcc (
|
|
||||||
b2.exe -l400 --hash warnings-as-errors=on -j2 %compiler% address-model=%model% debug-iterators=on picker-debugging=on invariant-checks=full variant=%variant% %linkflags% %include% link=shared ssl=%ssl% crypto=%crypto% win-tests
|
|
||||||
)
|
|
||||||
- cd %ROOT_DIRECTORY%\bindings\python
|
- cd %ROOT_DIRECTORY%\bindings\python
|
||||||
# we use 64 bit python build
|
# we use 64 bit python build
|
||||||
- if defined python ( c:\Python35-x64\python.exe test.py )
|
- if defined python ( c:\Python35-x64\python.exe test.py )
|
||||||
|
|
|
@ -192,4 +192,3 @@ namespace libtorrent
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // TORRENT_DISK_BUFFER_POOL_HPP
|
#endif // TORRENT_DISK_BUFFER_POOL_HPP
|
||||||
|
|
||||||
|
|
|
@ -327,4 +327,3 @@ namespace libtorrent
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // TORRENT_ENTRY_HPP_INCLUDED
|
#endif // TORRENT_ENTRY_HPP_INCLUDED
|
||||||
|
|
||||||
|
|
|
@ -49,4 +49,3 @@ namespace libtorrent
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -35,10 +35,11 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
#ifndef TORRENT_DISABLE_EXTENSIONS
|
#ifndef TORRENT_DISABLE_EXTENSIONS
|
||||||
|
|
||||||
|
#include "libtorrent/config.hpp"
|
||||||
|
|
||||||
#include "libtorrent/aux_/disable_warnings_push.hpp"
|
#include "libtorrent/aux_/disable_warnings_push.hpp"
|
||||||
|
|
||||||
#include <boost/shared_ptr.hpp>
|
#include <boost/shared_ptr.hpp>
|
||||||
#include "libtorrent/config.hpp"
|
|
||||||
|
|
||||||
#include "libtorrent/aux_/disable_warnings_pop.hpp"
|
#include "libtorrent/aux_/disable_warnings_pop.hpp"
|
||||||
|
|
||||||
|
@ -59,4 +60,3 @@ namespace libtorrent
|
||||||
#endif // TORRENT_DISABLE_EXTENSIONS
|
#endif // TORRENT_DISABLE_EXTENSIONS
|
||||||
|
|
||||||
#endif // TORRENT_SMART_BAN_HPP_INCLUDED
|
#endif // TORRENT_SMART_BAN_HPP_INCLUDED
|
||||||
|
|
||||||
|
|
|
@ -62,4 +62,3 @@ namespace libtorrent
|
||||||
|
|
||||||
#endif // TORRENT_DISABLE_EXTENSIONS
|
#endif // TORRENT_DISABLE_EXTENSIONS
|
||||||
#endif // TORRENT_UT_METADATA_HPP_INCLUDED
|
#endif // TORRENT_UT_METADATA_HPP_INCLUDED
|
||||||
|
|
||||||
|
|
|
@ -33,10 +33,9 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||||
#ifndef TORRENT_UT_PEX_EXTENSION_HPP_INCLUDED
|
#ifndef TORRENT_UT_PEX_EXTENSION_HPP_INCLUDED
|
||||||
#define TORRENT_UT_PEX_EXTENSION_HPP_INCLUDED
|
#define TORRENT_UT_PEX_EXTENSION_HPP_INCLUDED
|
||||||
|
|
||||||
#include "libtorrent/config.hpp"
|
|
||||||
|
|
||||||
#ifndef TORRENT_DISABLE_EXTENSIONS
|
#ifndef TORRENT_DISABLE_EXTENSIONS
|
||||||
|
|
||||||
|
#include "libtorrent/config.hpp"
|
||||||
#include "libtorrent/socket.hpp" // for endpoint
|
#include "libtorrent/socket.hpp" // for endpoint
|
||||||
|
|
||||||
#include "libtorrent/aux_/disable_warnings_push.hpp"
|
#include "libtorrent/aux_/disable_warnings_push.hpp"
|
||||||
|
|
|
@ -50,7 +50,7 @@ namespace libtorrent
|
||||||
: m_ptr(v.data()), m_len(v.size()) {}
|
: m_ptr(v.data()), m_len(v.size()) {}
|
||||||
|
|
||||||
span(T& p) : m_ptr(&p), m_len(1) {}
|
span(T& p) : m_ptr(&p), m_len(1) {}
|
||||||
span(T* p, size_t l) : m_ptr(p), m_len(l) {}
|
span(T* p, size_t const l) : m_ptr(p), m_len(l) {}
|
||||||
|
|
||||||
template <typename U, size_t N>
|
template <typename U, size_t N>
|
||||||
span(std::array<U, N>& arr)
|
span(std::array<U, N>& arr)
|
||||||
|
@ -98,7 +98,7 @@ namespace libtorrent
|
||||||
return { data() + offset, size() - offset };
|
return { data() + offset, size() - offset };
|
||||||
}
|
}
|
||||||
|
|
||||||
span<T> subspan(size_t const offset, size_t count) const
|
span<T> subspan(size_t const offset, size_t const count) const
|
||||||
{
|
{
|
||||||
TORRENT_ASSERT(size() >= offset);
|
TORRENT_ASSERT(size() >= offset);
|
||||||
TORRENT_ASSERT(size() >= offset + count);
|
TORRENT_ASSERT(size() >= offset + count);
|
||||||
|
|
|
@ -1199,7 +1199,7 @@ namespace libtorrent
|
||||||
void setup_peer_class();
|
void setup_peer_class();
|
||||||
|
|
||||||
// The list of web seeds in this torrent. Seeds with fatal errors are
|
// The list of web seeds in this torrent. Seeds with fatal errors are
|
||||||
// removed from the set. It's important that iteratores are not
|
// removed from the set. It's important that iterators are not
|
||||||
// invalidated as entries are added and removed from this list, hence the
|
// invalidated as entries are added and removed from this list, hence the
|
||||||
// std::list
|
// std::list
|
||||||
std::list<web_seed_t> m_web_seeds;
|
std::list<web_seed_t> m_web_seeds;
|
||||||
|
@ -1414,11 +1414,11 @@ namespace libtorrent
|
||||||
// if we're currently in upload-mode
|
// if we're currently in upload-mode
|
||||||
std::uint16_t m_upload_mode_time;
|
std::uint16_t m_upload_mode_time;
|
||||||
|
|
||||||
// true when this torrent should anncounce to
|
// true when this torrent should announce to
|
||||||
// trackers
|
// trackers
|
||||||
bool m_announce_to_trackers:1;
|
bool m_announce_to_trackers:1;
|
||||||
|
|
||||||
// true when this torrent should anncounce to
|
// true when this torrent should announce to
|
||||||
// the local network
|
// the local network
|
||||||
bool m_announce_to_lsd:1;
|
bool m_announce_to_lsd:1;
|
||||||
|
|
||||||
|
|
|
@ -1463,7 +1463,6 @@ namespace libtorrent
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
#ifndef TORRENT_DISABLE_LOGGING
|
#ifndef TORRENT_DISABLE_LOGGING
|
||||||
error_code ec;
|
|
||||||
static const char* hp_msg_name[] = {"rendezvous", "connect", "failed"};
|
static const char* hp_msg_name[] = {"rendezvous", "connect", "failed"};
|
||||||
peer_log(peer_log_alert::incoming_message, "HOLEPUNCH"
|
peer_log(peer_log_alert::incoming_message, "HOLEPUNCH"
|
||||||
, "msg: %s from %s to: unknown address type"
|
, "msg: %s from %s to: unknown address type"
|
||||||
|
|
|
@ -899,4 +899,3 @@ void http_connection::rate_limit(int limit)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -104,6 +104,10 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||||
// TODO: factor out cache_status to its own header
|
// TODO: factor out cache_status to its own header
|
||||||
#include "libtorrent/disk_io_thread.hpp" // for cache_status
|
#include "libtorrent/disk_io_thread.hpp" // for cache_status
|
||||||
|
|
||||||
|
#ifndef TORRENT_DISABLE_EXTENSIONS
|
||||||
|
#include "libtorrent/extensions/ut_pex.hpp" // for was_introduced_by
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef TORRENT_DISABLE_LOGGING
|
#ifndef TORRENT_DISABLE_LOGGING
|
||||||
#include "libtorrent/aux_/session_impl.hpp" // for tracker_logger
|
#include "libtorrent/aux_/session_impl.hpp" // for tracker_logger
|
||||||
#endif
|
#endif
|
||||||
|
@ -162,11 +166,6 @@ namespace libtorrent
|
||||||
restart_request.length = -1;
|
restart_request.length = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef TORRENT_DISABLE_EXTENSIONS
|
|
||||||
// defined in ut_pex.cpp
|
|
||||||
bool was_introduced_by(peer_plugin const*, tcp::endpoint const&);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
torrent_hot_members::torrent_hot_members(aux::session_interface& ses
|
torrent_hot_members::torrent_hot_members(aux::session_interface& ses
|
||||||
, add_torrent_params const& p, int const block_size
|
, add_torrent_params const& p, int const block_size
|
||||||
, bool const session_paused)
|
, bool const session_paused)
|
||||||
|
|
|
@ -626,7 +626,7 @@ namespace libtorrent { namespace
|
||||||
torrent& m_torrent;
|
torrent& m_torrent;
|
||||||
peer_connection& m_pc;
|
peer_connection& m_pc;
|
||||||
ut_pex_plugin& m_tp;
|
ut_pex_plugin& m_tp;
|
||||||
// stores all peers this this peer is connected to. These lists
|
// stores all peers this peer is connected to. These lists
|
||||||
// are updated with each pex message and are limited in size
|
// are updated with each pex message and are limited in size
|
||||||
// to protect against malicious clients. These lists are also
|
// to protect against malicious clients. These lists are also
|
||||||
// used for looking up which peer a peer that supports holepunch
|
// used for looking up which peer a peer that supports holepunch
|
||||||
|
@ -710,4 +710,3 @@ namespace libtorrent
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue