some trivial cleanup (#978)

some trivial cleanup
This commit is contained in:
Alden Torres 2016-08-02 12:13:05 -04:00 committed by Arvid Norberg
parent caa034b1ac
commit 3c9ed50d0b
6 changed files with 9 additions and 54 deletions

View File

@ -22,9 +22,9 @@ rm -f bindings/python/Makefile bindings/python/Makefile.in
chmod a-x docs/*.rst docs/*.htm* src/*.cpp include/libtorrent/*.hpp
./autotool.sh
./configure --enable-python-binding --enable-examples=yes --enable-encryption --enable-tests=yes --with-boost-system=mt --with-boost-chrono=mt --with-boost-random=mt --with-boost-python=mt
./configure --enable-python-binding --enable-examples=yes --enable-encryption --enable-tests=yes --with-boost-system=mt --with-boost-python=mt
make V=1 -j8 distcheck
./configure --enable-python-binding --enable-examples=yes --enable-encryption --with-boost-system=mt --with-boost-chrono=mt --with-boost-random=mt --with-boost-python=mt
./configure --enable-python-binding --enable-examples=yes --enable-encryption --with-boost-system=mt --with-boost-python=mt
make V=1 -j8 dist

View File

@ -33,11 +33,8 @@ POSSIBILITY OF SUCH DAMAGE.
#ifndef TORRENT_ALERT_HPP_INCLUDED
#define TORRENT_ALERT_HPP_INCLUDED
#include <memory>
#include <deque>
#include <string>
#include <vector>
#include <type_traits>
// OVERVIEW
//
@ -250,11 +247,6 @@ namespace libtorrent {
#ifndef TORRENT_NO_DEPRECATE
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
// determines whether or not an alert is allowed to be discarded
// when the alert queue is full. There are a few alerts which may not be discared,
// since they would break the user contract, such as save_resume_data_alert.
@ -268,10 +260,6 @@ namespace libtorrent {
virtual bool discardable_impl() const { return true; }
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#endif // TORRENT_NO_DEPRECATE
private:
@ -305,4 +293,3 @@ template <class T> T const* alert_cast(alert const* a)
} // namespace libtorrent
#endif // TORRENT_ALERT_HPP_INCLUDED

View File

@ -40,10 +40,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/aux_/disable_warnings_push.hpp"
#ifndef TORRENT_NO_DEPRECATE
#include <boost/function/function1.hpp>
#endif
#include <boost/function/function0.hpp>
#include <boost/function.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/config.hpp>
#include <list>
@ -53,12 +50,6 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/aux_/disable_warnings_pop.hpp"
#ifdef __GNUC__
// this is to suppress the warnings for using std::auto_ptr
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
namespace libtorrent {
#ifndef TORRENT_DISABLE_EXTENSIONS
@ -155,7 +146,7 @@ namespace libtorrent {
// passed to the client will be owned by libtorrent again, and reset.
int m_generation;
// this is where all alerts are queued up. There are two heterogenous
// this is where all alerts are queued up. There are two heterogeneous
// queues to double buffer the thread access. The std::mutex in the alert
// manager gives exclusive access to m_alerts[m_generation] and
// m_allocations[m_generation] whereas the other copy is exclusively
@ -172,9 +163,4 @@ namespace libtorrent {
};
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#endif

View File

@ -56,12 +56,6 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/aux_/disable_warnings_pop.hpp"
#ifdef __GNUC__
#pragma GCC diagnostic push
// this is to suppress the warnings for using std::auto_ptr
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
namespace libtorrent
{
@ -2471,10 +2465,4 @@ namespace libtorrent
enum { num_alert_types = 90 }; // this enum represents "max_alert_index" + 1
}
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#endif

View File

@ -35,15 +35,9 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/aux_/disable_warnings_push.hpp"
#include <boost/function/function1.hpp>
#include <boost/function/function2.hpp>
#include <boost/function/function5.hpp>
#include <functional>
#include <boost/shared_ptr.hpp>
#include <boost/function.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <boost/noncopyable.hpp>
#include <vector>
#include <string>
#ifdef TORRENT_USE_OPENSSL
#include <boost/asio/ssl/context.hpp>
@ -51,6 +45,9 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/aux_/disable_warnings_pop.hpp"
#include <vector>
#include <string>
#include "libtorrent/socket.hpp"
#include "libtorrent/error_code.hpp"
#include "libtorrent/http_parser.hpp"
@ -58,7 +55,6 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/assert.hpp"
#include "libtorrent/socket_type.hpp"
#include "libtorrent/session_settings.hpp"
#include "libtorrent/i2p_stream.hpp"
namespace libtorrent
@ -67,7 +63,7 @@ namespace libtorrent
struct http_connection;
struct resolver_interface;
const int default_max_bottled_buffer_size = 2*1024*1024;
const int default_max_bottled_buffer_size = 2 * 1024 * 1024;
typedef boost::function<void(error_code const&
, http_parser const&, char const* data, int size, http_connection&)> http_handler;

View File

@ -141,6 +141,4 @@ namespace libtorrent
std::swap(m_queue_size_limit, queue_size_limit_);
return queue_size_limit_;
}
}