diff options
author | Riccardo Spagni <ric@spagni.net> | 2016-12-20 17:40:11 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2016-12-20 17:40:11 +0200 |
commit | b9b9028e50e647073f55a8f32696ff593bc2fc16 (patch) | |
tree | 97376d7c253230f28821ddd9ccb2e3b65df29990 /src/p2p/net_peerlist.h | |
parent | Merge pull request #1464 (diff) | |
parent | support importing unportable outputs (diff) | |
download | monero-b9b9028e50e647073f55a8f32696ff593bc2fc16.tar.xz |
Merge pull request #1462
07b9138c support importing unportable outputs (kenshi84)
2ac80075 also use portable serializer for boost_serialization_helper.h and net_node.inl, completely adandon boost/archive/binary_oarchive.hpp (kenshi84)
d1d6e27a moved boost cpp into hpp since they're supposed to be header only (kenshi84)
66e6af89 added experimental boost::archive::portable_binary_{i|o}archive (kenshi84)
Diffstat (limited to 'src/p2p/net_peerlist.h')
-rw-r--r-- | src/p2p/net_peerlist.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/p2p/net_peerlist.h b/src/p2p/net_peerlist.h index c19ecf65f..fa69abd6e 100644 --- a/src/p2p/net_peerlist.h +++ b/src/p2p/net_peerlist.h @@ -36,8 +36,9 @@ #include <boost/foreach.hpp> //#include <boost/bimap.hpp> //#include <boost/bimap/multiset_of.hpp> -#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> #include <boost/serialization/version.hpp> #include <boost/multi_index_container.hpp> |