Skip to content

Commit 38a54a5

Browse files
committed
Merge #11164: Fix boost headers included as user instead of system headers
5ac072c 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
2 parents df8c722 + 5ac072c commit 38a54a5

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

configure.ac

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -827,14 +827,14 @@ TEMP_CPPFLAGS="$CPPFLAGS"
827827
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
828828
AC_MSG_CHECKING([for mismatched boost c++11 scoped enums])
829829
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
830-
#include "boost/config.hpp"
831-
#include "boost/version.hpp"
830+
#include <boost/config.hpp>
831+
#include <boost/version.hpp>
832832
#if !defined(BOOST_NO_SCOPED_ENUMS) && !defined(BOOST_NO_CXX11_SCOPED_ENUMS) && BOOST_VERSION < 105700
833833
#define BOOST_NO_SCOPED_ENUMS
834834
#define BOOST_NO_CXX11_SCOPED_ENUMS
835835
#define CHECK
836836
#endif
837-
#include "boost/filesystem.hpp"
837+
#include <boost/filesystem.hpp>
838838
]],[[
839839
#if defined(CHECK)
840840
boost::filesystem::copy_file("foo", "bar");

src/miner.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
#include <stdint.h>
1313
#include <memory>
14-
#include "boost/multi_index_container.hpp"
15-
#include "boost/multi_index/ordered_index.hpp"
14+
#include <boost/multi_index_container.hpp>
15+
#include <boost/multi_index/ordered_index.hpp>
1616

1717
class CBlockIndex;
1818
class CChainParams;

src/txmempool.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@
2121
#include "sync.h"
2222
#include "random.h"
2323

24-
#include "boost/multi_index_container.hpp"
25-
#include "boost/multi_index/ordered_index.hpp"
26-
#include "boost/multi_index/hashed_index.hpp"
24+
#include <boost/multi_index_container.hpp>
25+
#include <boost/multi_index/hashed_index.hpp>
26+
#include <boost/multi_index/ordered_index.hpp>
2727
#include <boost/multi_index/sequenced_index.hpp>
28-
2928
#include <boost/signals2/signal.hpp>
3029

3130
class CBlockIndex;

0 commit comments

Comments
 (0)