Browse Source

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.
0.16
Dan Raviv 7 years ago
parent
commit
5ac072caa2
  1. 6
      configure.ac
  2. 4
      src/miner.h
  3. 7
      src/txmempool.h

6
configure.ac

@ -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

@ -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

@ -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;

Loading…
Cancel
Save