Merge pull request #1515

ada7c7da portable serializer: tests added (kenshi84)
f390a0e2 portable serializer: make signerd/unsigned tx portable, ignore archive version checking (kenshi84)

2 files changed, 7 insertions, 0 deletions

diff --git a/external/boost/archive/portable_binary_iarchive.hpp b/external/boost/archive/portable_binary_iarchive.hpp
index c136e7d8a..b67899b52 100644
--- a/external/boost/archive/portable_binary_iarchive.hpp
+++ b/external/boost/archive/portable_binary_iarchive.hpp
@@ -321,6 +321,8 @@ portable_binary_iarchive::init(unsigned int flags){
         boost::archive::library_version_type input_library_version;

         * this >> input_library_version;

 

+        // ignore archive version checking

+        /*

         // extra little .t is to get around borland quirk

         if(boost::archive::BOOST_ARCHIVE_VERSION() < input_library_version)

             boost::serialization::throw_exception(

@@ -328,6 +330,7 @@ portable_binary_iarchive::init(unsigned int flags){
                     boost::archive::archive_exception::unsupported_version

                 )

             );

+        */

         

         #if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3205))

         this->set_library_version(input_library_version);

diff --git a/external/boost/archive/portable_binary_oarchive.hpp b/external/boost/archive/portable_binary_oarchive.hpp
index be12b57aa..74afe2357 100644
--- a/external/boost/archive/portable_binary_oarchive.hpp
+++ b/external/boost/archive/portable_binary_oarchive.hpp
@@ -277,10 +277,14 @@ portable_binary_oarchive::init(unsigned int flags) {
             boost::archive::BOOST_ARCHIVE_SIGNATURE()

         );

         * this << file_signature;

+        // ignore archive version checking

+        const boost::archive::library_version_type v{};

+        /*

         // write library version

         const boost::archive::library_version_type v(

             boost::archive::BOOST_ARCHIVE_VERSION()

         );

+        */

         * this << v;

     }

     save(static_cast<unsigned char>(m_flags >> CHAR_BIT));