LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #11164: Fix boost headers included as user instead of system headers

Browse source 
5ac072caa Fix boost headers included as user instead of system headers (Dan Raviv)

Pull request description:

  In most of the project, boost headers are included as system headers.
  Fix the few inconsistent places where they aren't.

Tree-SHA512: 280af33a7bdc9d68a15b729fa88e1e7627e20a054b8d52a12cc5350c1ac9e9c90fb09f0aa97a00960969f75bcf3403dc52b834c94448b814efa63bfaf3b82663
This commit is contained in:
Wladimir J. van der Laan 2017-09-05 22:25:42 +02:00
commit 38a54a50fa
No known key found for this signature in database
GPG key ID: 1E4AED62986CD25D
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -827,14 +827,14 @@ TEMP_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
AC_MSG_CHECKING([for mismatched boost c++11 scoped enums]) AC_MSG_CHECKING([for mismatched boost c++11 scoped enums])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include "boost/config.hpp" #include <boost/config.hpp>
#include "boost/version.hpp" #include <boost/version.hpp>
#if !defined(BOOST_NO_SCOPED_ENUMS) && !defined(BOOST_NO_CXX11_SCOPED_ENUMS) && BOOST_VERSION < 105700 #if !defined(BOOST_NO_SCOPED_ENUMS) && !defined(BOOST_NO_CXX11_SCOPED_ENUMS) && BOOST_VERSION < 105700
#define BOOST_NO_SCOPED_ENUMS #define BOOST_NO_SCOPED_ENUMS
#define BOOST_NO_CXX11_SCOPED_ENUMS #define BOOST_NO_CXX11_SCOPED_ENUMS
#define CHECK #define CHECK
#endif #endif
#include "boost/filesystem.hpp" #include <boost/filesystem.hpp>
]],[[ ]],[[
#if defined(CHECK) #if defined(CHECK)
boost::filesystem::copy_file("foo", "bar"); boost::filesystem::copy_file("foo", "bar");

4
src/miner.h
View file

@ -11,8 +11,8 @@
#include <stdint.h> #include <stdint.h>
#include <memory> #include <memory>
#include "boost/multi_index_container.hpp" #include <boost/multi_index_container.hpp>
#include "boost/multi_index/ordered_index.hpp" #include <boost/multi_index/ordered_index.hpp>
class CBlockIndex; class CBlockIndex;
class CChainParams; class CChainParams;

7
src/txmempool.h
View file

@ -21,11 +21,10 @@
#include "sync.h" #include "sync.h"
#include "random.h" #include "random.h"
#include "boost/multi_index_container.hpp" #include <boost/multi_index_container.hpp>
#include "boost/multi_index/ordered_index.hpp" #include <boost/multi_index/hashed_index.hpp>
#include "boost/multi_index/hashed_index.hpp" #include <boost/multi_index/ordered_index.hpp>
#include <boost/multi_index/sequenced_index.hpp> #include <boost/multi_index/sequenced_index.hpp>
#include <boost/signals2/signal.hpp> #include <boost/signals2/signal.hpp>
class CBlockIndex; class CBlockIndex;