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

fix static_variant to/from variant

Browse source
This commit is contained in:
Daniel Larimer 2015-03-05 09:54:33 -05:00
parent 3a120c0f7f
commit 73c2c1de90
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/fc/static_variant.hpp
View file

@ -348,7 +348,7 @@ struct visitor {
typedef void result_type; typedef void result_type;
template<typename T> void operator()( T& v )const template<typename T> void operator()( T& v )const
{ {
to_variant( var, v ); from_variant( var, v );
} }
}; };
@ -364,9 +364,8 @@ struct visitor {
template<typename... T> void from_variant( const fc::variant& v, fc::static_variant<T...>& s ) template<typename... T> void from_variant( const fc::variant& v, fc::static_variant<T...>& s )
{ {
auto ar = v.get_array(); auto ar = v.get_array();
if( ar.size() ) return; if( ar.size() < 2 ) return;
s.set_which( ar[0].as_uint64() ); s.set_which( ar[0].as_uint64() );
if( ar.size() < 1 ) return;
s.visit( to_static_variant(ar[1]) ); s.visit( to_static_variant(ar[1]) );
} }

4
src/string.cpp
View file

@ -102,7 +102,7 @@ namespace fc {
} }
uint64_t to_uint64( const fc::string& i ) uint64_t to_uint64( const fc::string& i )
{ { try {
try try
{ {
return boost::lexical_cast<uint64_t>(i.c_str()); return boost::lexical_cast<uint64_t>(i.c_str());
@ -112,7 +112,7 @@ namespace fc {
FC_THROW_EXCEPTION( parse_error_exception, "Couldn't parse uint64_t" ); FC_THROW_EXCEPTION( parse_error_exception, "Couldn't parse uint64_t" );
} }
FC_RETHROW_EXCEPTIONS( warn, "${i} => uint64_t", ("i",i) ) FC_RETHROW_EXCEPTIONS( warn, "${i} => uint64_t", ("i",i) )
} } FC_CAPTURE_AND_RETHROW( (i) ) }
double to_double( const fc::string& i) double to_double( const fc::string& i)
{ {

4
src/variant.cpp
View file

@ -384,7 +384,7 @@ int64_t variant::as_int64()const
} }
uint64_t variant::as_uint64()const uint64_t variant::as_uint64()const
{ { try {
switch( get_type() ) switch( get_type() )
{ {
case string_type: case string_type:
@ -402,7 +402,7 @@ uint64_t variant::as_uint64()const
default: default:
FC_THROW_EXCEPTION( bad_cast_exception,"Invalid cast from ${type} to uint64", ("type",get_type())); FC_THROW_EXCEPTION( bad_cast_exception,"Invalid cast from ${type} to uint64", ("type",get_type()));
} }
} } FC_CAPTURE_AND_RETHROW( (*this) ) }
double variant::as_double()const double variant::as_double()const