LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Fix boost headers included as user instead of system headers

Browse source 
In most of the project, boost headers are included as system headers.
Fix the few inconsistent places where they aren't.
This commit is contained in:
Dan Raviv 2017-08-26 21:09:00 +03:00
parent 7fd49d01dc
commit 5ac072caa2
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

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

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

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