jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix unknown pragma warning on msvc

Browse Source
This commit is contained in:
arvidn
2015-08-20 21:14:39 +02:00
parent 206e4b7c71
commit 40a67ecbc8
4 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/libtorrent/alert.hpp
View File

@@ -267,8 +267,10 @@ namespace libtorrent {
#ifndef TORRENT_NO_DEPRECATE #ifndef TORRENT_NO_DEPRECATE
#ifdef __GNUC__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
// determines whether or not an alert is allowed to be discarded // 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, // when the alert queue is full. There are a few alerts which may not be discared,
@@ -289,10 +291,12 @@ namespace libtorrent {
virtual std::auto_ptr<alert> clone_impl() const = 0; virtual std::auto_ptr<alert> clone_impl() const = 0;
#ifdef __GNUC__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
#endif // TORRENT_NO_DEPRECATE
private: private:
// explicitly disallow assignment, to silence msvc warning // explicitly disallow assignment, to silence msvc warning
alert& operator=(alert const&); alert& operator=(alert const&);

8
include/libtorrent/session_handle.hpp
View File

@@ -895,13 +895,17 @@ namespace libtorrent
TORRENT_DEPRECATED TORRENT_DEPRECATED
void pop_alerts(std::deque<alert*>* alerts); void pop_alerts(std::deque<alert*>* alerts);
#ifdef __GNUC__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
TORRENT_DEPRECATED TORRENT_DEPRECATED
std::auto_ptr<alert> pop_alert(); std::auto_ptr<alert> pop_alert();
#ifdef __GNUC__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif
#endif #endif
@@ -980,8 +984,10 @@ namespace libtorrent
TORRENT_DEPRECATED TORRENT_DEPRECATED
boost::uint32_t get_alert_mask() const; boost::uint32_t get_alert_mask() const;
#ifdef __GNUC__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
// This sets a function to be called (from within libtorrent's netowrk // This sets a function to be called (from within libtorrent's netowrk
// thread) every time an alert is posted. Since the function (``fun``) is // thread) every time an alert is posted. Since the function (``fun``) is
@@ -995,7 +1001,9 @@ namespace libtorrent
void set_alert_dispatch( void set_alert_dispatch(
boost::function<void(std::auto_ptr<alert>)> const& fun); boost::function<void(std::auto_ptr<alert>)> const& fun);
#ifdef __GNUC__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif
// Starts and stops Local Service Discovery. This service will broadcast // Starts and stops Local Service Discovery. This service will broadcast
// the infohashes of all the non-private torrents on the local network to // the infohashes of all the non-private torrents on the local network to

4
src/alert_manager.cpp
View File

@@ -117,8 +117,10 @@ namespace libtorrent
return false; return false;
} }
#ifdef __GNUC__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
void alert_manager::set_dispatch_function( void alert_manager::set_dispatch_function(
boost::function<void(std::auto_ptr<alert>)> const& fun) boost::function<void(std::auto_ptr<alert>)> const& fun)
@@ -141,7 +143,9 @@ namespace libtorrent
} }
} }
#ifdef __GNUC__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif
#endif #endif

8
src/session_handle.cpp
View File

@@ -838,8 +838,10 @@ namespace libtorrent
return TORRENT_SYNC_CALL_RET(int, max_connections); return TORRENT_SYNC_CALL_RET(int, max_connections);
} }
#ifdef __GNUC__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
std::auto_ptr<alert> session_handle::pop_alert() std::auto_ptr<alert> session_handle::pop_alert()
{ {
@@ -848,7 +850,9 @@ namespace libtorrent
return a->clone(); return a->clone();
} }
#ifdef __GNUC__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif
void session_handle::pop_alerts(std::deque<alert*>* alerts) void session_handle::pop_alerts(std::deque<alert*>* alerts)
{ {
@@ -911,15 +915,19 @@ namespace libtorrent
return get_settings().get_int(settings_pack::alert_mask); return get_settings().get_int(settings_pack::alert_mask);
} }
#ifdef __GNUC__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
void session_handle::set_alert_dispatch(boost::function<void(std::auto_ptr<alert>)> const& fun) void session_handle::set_alert_dispatch(boost::function<void(std::auto_ptr<alert>)> const& fun)
{ {
m_impl->alerts().set_dispatch_function(fun); m_impl->alerts().set_dispatch_function(fun);
} }
#ifdef __GNUC__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif
void session_handle::start_lsd() void session_handle::start_lsd()
{ {