diff options
| author | kenshi84 <kenshi84@protonmail.ch> | 2016-12-30 22:51:43 +0900 |
|---|---|---|
| committer | kenshi84 <kenshi84@protonmail.ch> | 2017-01-02 20:04:58 +0900 |
| commit | f390a0e2dcc6b2a67b3161d167da4378e898e177 (patch) | |
| tree | 251bbcf129128f677263a57c79a046b9cbe0d5f1 /external/boost | |
| parent | Merge pull request #1487 (diff) | |
| download | monero-f390a0e2dcc6b2a67b3161d167da4378e898e177.tar.xz | |
portable serializer: make signerd/unsigned tx portable, ignore archive version checking
Diffstat (limited to 'external/boost')
| -rw-r--r-- | external/boost/archive/portable_binary_iarchive.hpp | 3 | ||||
| -rw-r--r-- | external/boost/archive/portable_binary_oarchive.hpp | 4 |
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 7149cca0f..78d615f28 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 8fd7090a1..cdb4caf03 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));
|