From 5ac072caa242d7ecf724e0c3a23f4a7c477a3a1e Mon Sep 17 00:00:00 2001 From: Dan Raviv Date: Sat, 26 Aug 2017 21:09:00 +0300 Subject: [PATCH] Fix boost headers included as user instead of system headers In most of the project, boost headers are included as system headers. Fix the few inconsistent places where they aren't. --- configure.ac | 6 +++--- src/miner.h | 4 ++-- src/txmempool.h | 7 +++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index e5ed938947b..4513099d58a 100644 --- a/configure.ac +++ b/configure.ac @@ -827,14 +827,14 @@ TEMP_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" AC_MSG_CHECKING([for mismatched boost c++11 scoped enums]) AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include "boost/config.hpp" - #include "boost/version.hpp" + #include + #include #if !defined(BOOST_NO_SCOPED_ENUMS) && !defined(BOOST_NO_CXX11_SCOPED_ENUMS) && BOOST_VERSION < 105700 #define BOOST_NO_SCOPED_ENUMS #define BOOST_NO_CXX11_SCOPED_ENUMS #define CHECK #endif - #include "boost/filesystem.hpp" + #include ]],[[ #if defined(CHECK) boost::filesystem::copy_file("foo", "bar"); diff --git a/src/miner.h b/src/miner.h index 6e5fe761db2..abd2ff6199c 100644 --- a/src/miner.h +++ b/src/miner.h @@ -11,8 +11,8 @@ #include #include -#include "boost/multi_index_container.hpp" -#include "boost/multi_index/ordered_index.hpp" +#include +#include class CBlockIndex; class CChainParams; diff --git a/src/txmempool.h b/src/txmempool.h index 5b0db5266ed..1ff812092a3 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -21,11 +21,10 @@ #include "sync.h" #include "random.h" -#include "boost/multi_index_container.hpp" -#include "boost/multi_index/ordered_index.hpp" -#include "boost/multi_index/hashed_index.hpp" +#include +#include +#include #include - #include class CBlockIndex;