diff options
| author | Dan Raviv <[email protected]> | 2017-08-26 21:09:00 +0300 |
|---|---|---|
| committer | Dan Raviv <[email protected]> | 2017-08-26 21:09:00 +0300 |
| commit | 5ac072caa242d7ecf724e0c3a23f4a7c477a3a1e (patch) | |
| tree | a2976be6e6b5d263eb6d7a0576f3f1e91dbe19d6 | |
| parent | Merge #11151: Fix header guards using reserved identifiers (diff) | |
| download | discoin-5ac072caa242d7ecf724e0c3a23f4a7c477a3a1e.tar.xz discoin-5ac072caa242d7ecf724e0c3a23f4a7c477a3a1e.zip | |
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.
| -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 e5ed93894..4513099d5 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 6e5fe761d..abd2ff619 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 5b0db5266..1ff812092 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; |