diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-09-05 22:25:42 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-09-05 22:27:17 +0200 |
| commit | 38a54a50fa5d6d350eda413df2c165c06ad3ef0d (patch) | |
| tree | 760eb84e4b2681a10fd8abfdd9113f2bfdba62a2 | |
| parent | df8c72237a0cafc1542e57f2a29049b07c7f4959 (diff) | |
| parent | 5ac072caa242d7ecf724e0c3a23f4a7c477a3a1e (diff) | |
| download | bitcoin-38a54a50fa5d6d350eda413df2c165c06ad3ef0d.tar.xz | |
Merge #11164: Fix boost headers included as user instead of system headers
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
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/miner.h | 4 | ||||
| -rw-r--r-- | src/txmempool.h | 7 |
3 files changed, 8 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index fb6d7d484e..e3e71044da 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 <boost/config.hpp> + #include <boost/version.hpp> #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 <boost/filesystem.hpp> ]],[[ #if defined(CHECK) boost::filesystem::copy_file("foo", "bar"); diff --git a/src/miner.h b/src/miner.h index 6e5fe761db..abd2ff6199 100644 --- a/src/miner.h +++ b/src/miner.h @@ -11,8 +11,8 @@ #include <stdint.h> #include <memory> -#include "boost/multi_index_container.hpp" -#include "boost/multi_index/ordered_index.hpp" +#include <boost/multi_index_container.hpp> +#include <boost/multi_index/ordered_index.hpp> class CBlockIndex; class CChainParams; diff --git a/src/txmempool.h b/src/txmempool.h index 65586a6e6e..b07886579c 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 <boost/multi_index_container.hpp> +#include <boost/multi_index/hashed_index.hpp> +#include <boost/multi_index/ordered_index.hpp> #include <boost/multi_index/sequenced_index.hpp> - #include <boost/signals2/signal.hpp> class CBlockIndex; |