From 1f3735e3624dbf14013420bf721acfeac6f49581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miha=20=C4=8Can=C4=8Dula?= Date: Tue, 20 Aug 2019 11:25:38 +0200 Subject: [PATCH] Fixes to adapt to changes in variant API --- include/fc/crypto/md5.hpp | 4 ++-- src/crypto/md5.cpp | 8 ++++---- tests/CMakeLists.txt | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/fc/crypto/md5.hpp b/include/fc/crypto/md5.hpp index 06141f7..9f2027c 100755 --- a/include/fc/crypto/md5.hpp +++ b/include/fc/crypto/md5.hpp @@ -67,8 +67,8 @@ class md5 }; class variant; - void to_variant( const md5& bi, variant& v ); - void from_variant( const variant& v, md5& bi ); + void to_variant( const md5& bi, variant& v, uint32_t max_depth = 1 ); + void from_variant( const variant& v, md5& bi, uint32_t max_depth = 1 ); } // fc diff --git a/src/crypto/md5.cpp b/src/crypto/md5.cpp index fd304eb..b84796d 100755 --- a/src/crypto/md5.cpp +++ b/src/crypto/md5.cpp @@ -81,13 +81,13 @@ namespace fc { 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( (const char*)&bi, ((const char*)&bi) + sizeof(bi) ); + v = fc::variant( std::vector( (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 ve = v.as< std::vector >(); + std::vector ve = v.as< std::vector >(max_depth); if( ve.size() ) memcpy(&bi, ve.data(), fc::min(ve.size(),sizeof(bi)) ); else diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 0370071..ec052b9 100755 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -54,7 +54,6 @@ add_executable( all_tests all_tests.cpp bloom_test.cpp real128_test.cpp serialization_test.cpp - time_test.cpp utf8_test.cpp ) target_link_libraries( all_tests fc )