diff options
| author | kenshi84 <kenshi84@protonmail.ch> | 2016-12-20 13:04:19 +0900 |
|---|---|---|
| committer | kenshi84 <kenshi84@protonmail.ch> | 2016-12-20 13:04:19 +0900 |
| commit | 2ac80075444ebac2feef59f98c912342a708606d (patch) | |
| tree | 3c91949940c438dea8c53b62ae5b1ee16c3f0ad1 /src/common | |
| parent | moved boost cpp into hpp since they're supposed to be header only (diff) | |
| download | monero-2ac80075444ebac2feef59f98c912342a708606d.tar.xz | |
also use portable serializer for boost_serialization_helper.h and net_node.inl, completely adandon boost/archive/binary_oarchive.hpp
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/boost_serialization_helper.h | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/src/common/boost_serialization_helper.h b/src/common/boost_serialization_helper.h index c640a1705..fe01532d8 100644 --- a/src/common/boost_serialization_helper.h +++ b/src/common/boost_serialization_helper.h @@ -30,8 +30,9 @@ #pragma once -#include <boost/archive/binary_oarchive.hpp> #include <boost/archive/binary_iarchive.hpp> +#include <boost/archive/portable_binary_oarchive.hpp> +#include <boost/archive/portable_binary_iarchive.hpp> namespace tools @@ -76,7 +77,7 @@ namespace tools return false; #endif - boost::archive::binary_oarchive a(data_file); + boost::archive::portable_binary_oarchive a(data_file); a << obj; if (data_file.fail()) return false; @@ -101,9 +102,23 @@ namespace tools data_file.open( file_path, std::ios_base::binary | std::ios_base::in); if(data_file.fail()) return false; - boost::archive::binary_iarchive a(data_file); - - a >> obj; + try + { + // first try reading in portable mode + boost::archive::portable_binary_iarchive a(data_file); + a >> obj; + } + catch(...) + { + // if failed, try reading in unportable mode + boost::filesystem::copy_file(file_path, file_path + ".unportable", boost::filesystem::copy_option::overwrite_if_exists); + data_file.close(); + data_file.open( file_path, std::ios_base::binary | std::ios_base::in); + if(data_file.fail()) + return false; + boost::archive::binary_iarchive a(data_file); + a >> obj; + } return !data_file.fail(); CATCH_ENTRY_L0("unserialize_obj_from_file", false); } |