Merge pull request #211 from psychocrypt/fix-boostDepricatedUsage

fix usage of depricated boost functions/defines
ryo-currency · Aug 20, 2019 · 6a10723 · 6a10723
2 parents e25dfe4 + ae70088
commit 6a10723
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/contrib/epee/include/math_helper.h b/contrib/epee/include/math_helper.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <boost/timer.hpp>
+#include <boost/timer/timer.hpp>
 #include <boost/uuid/random_generator.hpp>
 #include <boost/uuid/uuid.hpp>
 #include <list>

diff --git 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
@@ -234,7 +234,7 @@ BOOST_SERIALIZATION_REGISTER_ARCHIVE(portable_binary_iarchive)
 #include <string>
 
 #include <boost/archive/archive_exception.hpp>
-#include <boost/detail/endian.hpp>
+#include <boost/predef/other/endian.h>
 #include <boost/serialization/throw_exception.hpp>
 
 namespace boost
@@ -263,12 +263,12 @@ portable_binary_iarchive::load_impl(boost::intmax_t &l, char maxsize)
 			portable_binary_iarchive_exception());
 
 	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
@@ -226,8 +226,7 @@ BOOST_SERIALIZATION_REGISTER_ARCHIVE(portable_binary_oarchive)
 // http://www.boost.org/LICENSE_1_0.txt)
 
 //  See http://www.boost.org for updates, documentation, and revision history.
-
-#include <boost/detail/endian.hpp>
+#include <boost/predef/other/endian.h>
 #include <ostream>
 
 namespace boost
@@ -269,7 +268,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);