porting json/variant fixes from bitshares #3539

EOSIO · May 31, 2018 · 1ab2fc0 · 1ab2fc0
1 parent 7088290
commit 1ab2fc0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/libraries/fc/include/fc/crypto/elliptic.hpp b/libraries/fc/include/fc/crypto/elliptic.hpp
@@ -231,10 +231,10 @@ namespace fc {
       };
 
   } // namespace ecc
-  void to_variant( const ecc::private_key& var,  variant& vo );
-  void from_variant( const variant& var,  ecc::private_key& vo );
-  void to_variant( const ecc::public_key& var,  variant& vo );
-  void from_variant( const variant& var,  ecc::public_key& vo );
+  void to_variant( const ecc::private_key& var,  variant& vo, uint32_t max_depth );
+  void from_variant( const variant& var,  ecc::private_key& vo, uint32_t max_depth );
+  void to_variant( const ecc::public_key& var,  variant& vo, uint32_t max_depth );
+  void from_variant( const variant& var,  ecc::public_key& vo, uint32_t max_depth );
 
   namespace raw
   {

diff --git a/libraries/fc/src/crypto/elliptic_common.cpp b/libraries/fc/src/crypto/elliptic_common.cpp
@@ -222,7 +222,7 @@ namespace fc { namespace ecc {
 
 }
 
-   void to_variant( const ecc::private_key& var,  variant& vo, uint32_t )
+void to_variant( const ecc::private_key& var,  variant& vo, uint32_t )
 {
     vo = var.get_secret();
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -222,7 +222,7 @@ namespace fc { namespace ecc { @@
     }
-       void to_variant( const ecc::private_key& var,  variant& vo, uint32_t )
+    void to_variant( const ecc::private_key& var,  variant& vo, uint32_t )
     {
         vo = var.get_secret();
     }
@@ Expand Down @@