using warnings guard in error.hpp and BOOST_SYSTEM_NO_DEPRECATED in Jamfile (#1184)

This commit is contained in:
Alden Torres 2016-10-04 21:54:02 -04:00 committed by Arvid Norberg
parent 9343f2fbfb
commit 8d940a4013
2 changed files with 3 additions and 0 deletions

View File

@ -224,6 +224,7 @@ rule linking ( properties * )
result += <define>BOOST_ALL_NO_LIB
<define>BOOST_MULTI_INDEX_DISABLE_SERIALIZATION
<define>BOOST_SYSTEM_NO_DEPRECATED
;
return $(result) ;

View File

@ -35,12 +35,14 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/config.hpp"
#include "libtorrent/aux_/disable_warnings_push.hpp"
#if defined TORRENT_WINDOWS || defined TORRENT_CYGWIN
// asio assumes that the windows error codes are defined already
#include <winsock2.h>
#endif
#include <boost/asio/error.hpp>
#include "libtorrent/aux_/disable_warnings_pop.hpp"
namespace libtorrent
{