Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add to_variant for some bip types

Browse source
This commit is contained in:
Michael Vandeberg 2016-10-20 14:32:11 -04:00
parent 929d42fe02
commit 9ce9270f82
1 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
include/fc/interprocess/container.hpp
View file

@ -6,6 +6,7 @@
#include <boost/interprocess/containers/vector.hpp> #include <boost/interprocess/containers/vector.hpp>
#include <boost/interprocess/containers/map.hpp> #include <boost/interprocess/containers/map.hpp>
#include <boost/interprocess/containers/flat_map.hpp> #include <boost/interprocess/containers/flat_map.hpp>
#include <boost/interprocess/containers/set.hpp>
#include <boost/interprocess/containers/deque.hpp> #include <boost/interprocess/containers/deque.hpp>
#include <fc/crypto/hex.hpp> #include <fc/crypto/hex.hpp>
#include <fc/io/raw_fwd.hpp> #include <fc/io/raw_fwd.hpp>
@ -33,23 +34,23 @@ namespace fc {
} }
} }
/* bip::flat_map == boost::flat_map //bip::map == boost::map
template<typename K, typename V, typename... T > template<typename K, typename V, typename... T >
void to_variant( const bip::flat_map< K, V, T... >& var, fc::variant& vo ) { void to_variant( const bip::map< K, V, T... >& var, fc::variant& vo ) {
std::vector< variant > vars(var.size()); std::vector< variant > vars(var.size());
size_t i = 0; size_t i = 0;
for( auto itr = var.begin(); itr != var.end(); ++itr, ++i ) for( auto itr = var.begin(); itr != var.end(); ++itr, ++i )
vars[i] = fc::variant(*itr); vars[i] = fc::variant(*itr);
vo = vars; vo = vars;
} }
/*
template<typename K, typename V, typename... A> template<typename K, typename V, typename... A>
void from_variant( const variant& var, bip::flat_map<K, V, A...>& vo ) void from_variant( const variant& var, bip::map<K, V, A...>& vo )
{ {
const variants& vars = var.get_array(); const variants& vars = var.get_array();
vo.clear(); vo.clear();
for( auto itr = vars.begin(); itr != vars.end(); ++itr ) for( auto itr = vars.begin(); itr != vars.end(); ++itr )
vo.insert( itr->as< std::pair<K,V> >() ); vo.insert( itr->as< std::pair<K,V> >() ); Not safe for interprocess. Needs allocator
} }
*/ */
@ -72,6 +73,28 @@ namespace fc {
} }
} }
template<typename... T >
void to_variant( const bip::set< T... >& t, fc::variant& v ) {
std::vector<variant> vars;
vars.reserve(t.size());
for( const auto& item : t ) {
vars.emplace_back( item );
}
v = std::move(vars);
}
/*
template<typename T, typename... A>
void from_variant( const fc::variant& v, bip::set< T, A... >& d ) {
const variants& vars = v.get_array();
d.clear();
d.reserve( vars.size() );
for( uint32_t i = 0; i < vars.size(); ++i ) {
from_variant( vars[i], d[i] ); Not safe for interprocess. Needs allocator
}
}
*/
template<typename... A> template<typename... A>
void to_variant( const bip::vector<char, A...>& t, fc::variant& v ) void to_variant( const bip::vector<char, A...>& t, fc::variant& v )
{ {