Merge pull request #5748

b350726 boost: update obsolete usage of endian API (moneromooo-monero)

3 files changed, 6 insertions, 6 deletions

diff --git a/external/boost/archive/portable_binary_archive.hpp b/external/boost/archive/portable_binary_archive.hpp
index e940c5b9e..7ae01a225 100644
--- a/external/boost/archive/portable_binary_archive.hpp
+++ b/external/boost/archive/portable_binary_archive.hpp
@@ -22,7 +22,7 @@
 #endif

 

 #include <boost/archive/basic_archive.hpp>

-#include <boost/detail/endian.hpp>

+#include <boost/predef/other/endian.h>

 

 #include <boost/archive/impl/archive_serializer_map.ipp>

 

diff --git a/external/boost/archive/portable_binary_iarchive.hpp b/external/boost/archive/portable_binary_iarchive.hpp
index 7792b530d..bd19599f3 100644
--- a/external/boost/archive/portable_binary_iarchive.hpp
+++ b/external/boost/archive/portable_binary_iarchive.hpp
@@ -226,7 +226,7 @@ public:
 #include <istream>

 #include <string>

 

-#include <boost/detail/endian.hpp>

+#include <boost/predef/other/endian.h>

 #include <boost/serialization/throw_exception.hpp>

 #include <boost/archive/archive_exception.hpp>

 

@@ -252,12 +252,12 @@ portable_binary_iarchive::load_impl(boost::intmax_t & l, char maxsize){
         );

 

     char * cptr = reinterpret_cast<char *>(& l);

-    #ifdef BOOST_BIG_ENDIAN

+    #if BOOST_ENDIAN_BIG_BYTE

         cptr += (sizeof(boost::intmax_t) - size);

     #endif

     this->primitive_base_t::load_binary(cptr, size);

 

-    #ifdef BOOST_BIG_ENDIAN

+    #if BOOST_ENDIAN_BIG_BYTE

         if(m_flags & endian_little)

     #else

         if(m_flags & endian_big)

diff --git a/external/boost/archive/portable_binary_oarchive.hpp b/external/boost/archive/portable_binary_oarchive.hpp
index e2dcb9456..783c7f7c9 100644
--- a/external/boost/archive/portable_binary_oarchive.hpp
+++ b/external/boost/archive/portable_binary_oarchive.hpp
@@ -221,7 +221,7 @@ public:
 //  See http://www.boost.org for updates, documentation, and revision history.

 

 #include <ostream>

-#include <boost/detail/endian.hpp>

+#include <boost/predef/other/endian.h>

 

 namespace boost { namespace archive {

 

@@ -258,7 +258,7 @@ portable_binary_oarchive::save_impl(
     else

         ll = l;

     char * cptr = reinterpret_cast<char *>(& ll);

-    #ifdef BOOST_BIG_ENDIAN

+    #if BOOST_ENDIAN_BIG_BYTE

         cptr += (sizeof(boost::intmax_t) - size);

         if(m_flags & endian_little)

             reverse_bytes(size, cptr);