Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

contrib: fix EOS portable archive for Boost 1.69

Browse source 
Boost 1.69 (Spirit.X2/X3) has dropped their own FP routines in favor of
boost::math.

https://www.boost.org/users/history/version_1_69_0.html
This commit is contained in:
anonimal 2019-02-15 23:33:16 +00:00
parent dc27c1404a
commit 3fa6bad35f
No known key found for this signature in database
GPG key ID: 66A76ECF914409F1
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
contrib/eos_portable_archive/eos/portable_iarchive.hpp
View file

@ -116,14 +116,15 @@
#include <boost/math/fpclassify.hpp>
#elif BOOST_VERSION < 104800
#include <boost/spirit/home/support/detail/integer/endian.hpp>
// Boost 1.69 (Spirit.X2/X3) has dropped their own FP routines in favor of boost::math
#elif BOOST_VERSION < 106900
#include <boost/spirit/home/support/detail/math/fpclassify.hpp>
#else
#include <boost/spirit/home/support/detail/endian/endian.hpp>
#include <boost/spirit/home/support/detail/math/fpclassify.hpp>
#endif
// namespace alias
#if BOOST_VERSION < 103800
#if BOOST_VERSION < 103800 || BOOST_VERSION >= 106900
namespace fp = boost::math;
#else
namespace fp = boost::spirit::math;

5
contrib/eos_portable_archive/eos/portable_oarchive.hpp
View file

@ -119,14 +119,15 @@
#include <boost/math/fpclassify.hpp>
#elif BOOST_VERSION < 104800
#include <boost/spirit/home/support/detail/integer/endian.hpp>
// Boost 1.69 (Spirit.X2/X3) has dropped their own FP routines in favor of boost::math
#elif BOOST_VERSION < 106900
#include <boost/spirit/home/support/detail/math/fpclassify.hpp>
#else
#include <boost/spirit/home/support/detail/endian/endian.hpp>
#include <boost/spirit/home/support/detail/math/fpclassify.hpp>
#endif
// namespace alias fp_classify
#if BOOST_VERSION < 103800
#if BOOST_VERSION < 103800 || BOOST_VERSION >= 106900
namespace fp = boost::math;
#else
namespace fp = boost::spirit::math;