wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

more msvc fixes

This commit is contained in:
Arvid Norberg 2015-05-31 09:02:42 +00:00
parent 84849f3afd
commit 91197005e9
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/libtorrent/settings_pack.hpp
View File

@ -35,10 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/entry.hpp" #include "libtorrent/entry.hpp"
#include <vector> #include <vector>
#ifndef TORRENT_NO_DEPRECATE
#include <boost/smart_ptr.hpp> #include <boost/smart_ptr.hpp>
#endif
// OVERVIEW // OVERVIEW
// //

5
src/asio.cpp
View File

@ -1,14 +1,13 @@
// builds all boost.asio source as a separate compilation unit // builds all boost.asio source as a separate compilation unit
#include <boost/version.hpp> #include <boost/version.hpp>
#include <boost/preprocessor/facilities/is_empty.hpp>
#include "libtorrent/config.hpp" #include "libtorrent/config.hpp"
// only define BOOST_ASIO_DECL if it hasn't already been defined // only define BOOST_ASIO_DECL if it hasn't already been defined
// or if it has been defined to an empty string // or if it has been defined to an empty string
#define TORRENT_IS_EMPTY_IMPL(VAL) VAL ## 1
#define TORRENT_IS_EMPTY(VAL) TORRENT_IS_EMPTY_IMPL(VAL)
#if !defined BOOST_ASIO_DECL || TORRENT_IS_EMPTY(BOOST_ASIO_DECL) == 1 #if !defined BOOST_ASIO_DECL || !BOOST_PP_IS_EMPTY(BOOST_ASIO_DECL)
#ifdef BOOST_ASIO_DECL #ifdef BOOST_ASIO_DECL
#undef BOOST_ASIO_DECL #undef BOOST_ASIO_DECL
#endif #endif