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

Fixes to adapt to changes in variant API

Browse source
This commit is contained in:
Miha Čančula 2019-08-20 11:25:38 +02:00
parent 33215ffb6e
commit 1f3735e362
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/fc/crypto/md5.hpp
View file

@ -67,8 +67,8 @@ class md5
}; };
class variant; class variant;
void to_variant( const md5& bi, variant& v ); void to_variant( const md5& bi, variant& v, uint32_t max_depth = 1 );
void from_variant( const variant& v, md5& bi ); void from_variant( const variant& v, md5& bi, uint32_t max_depth = 1 );
} // fc } // fc

8
src/crypto/md5.cpp
View file

@ -81,13 +81,13 @@ namespace fc {
return memcmp( h1._hash, h2._hash, sizeof(h1._hash) ) == 0; return memcmp( h1._hash, h2._hash, sizeof(h1._hash) ) == 0;
} }
void to_variant( const md5& bi, variant& v ) void to_variant( const md5& bi, variant& v, uint32_t max_depth )
{ {
v = std::vector<char>( (const char*)&bi, ((const char*)&bi) + sizeof(bi) ); v = fc::variant( std::vector<char>( (const char*)&bi, ((const char*)&bi) + sizeof(bi) ), max_depth );
} }
void from_variant( const variant& v, md5& bi ) void from_variant( const variant& v, md5& bi, uint32_t max_depth )
{ {
std::vector<char> ve = v.as< std::vector<char> >(); std::vector<char> ve = v.as< std::vector<char> >(max_depth);
if( ve.size() ) if( ve.size() )
memcpy(&bi, ve.data(), fc::min<size_t>(ve.size(),sizeof(bi)) ); memcpy(&bi, ve.data(), fc::min<size_t>(ve.size(),sizeof(bi)) );
else else

1
tests/CMakeLists.txt
View file

@ -54,7 +54,6 @@ add_executable( all_tests all_tests.cpp
bloom_test.cpp bloom_test.cpp
real128_test.cpp real128_test.cpp
serialization_test.cpp serialization_test.cpp
time_test.cpp
utf8_test.cpp utf8_test.cpp
) )
target_link_libraries( all_tests fc ) target_link_libraries( all_tests fc )