diff --git a/include/fc/crypto/base58.hpp b/include/fc/crypto/base58.hpp index 71beb15..63974d7 100644 --- a/include/fc/crypto/base58.hpp +++ b/include/fc/crypto/base58.hpp @@ -2,7 +2,7 @@ #include namespace fc { - fc::string to_base58( const char* d, size_t s ); - fc::vector from_base58( const fc::string& base58_str ); - size_t from_base58( const fc::string& base58_str, char* out_data, size_t out_data_len ); + std::string to_base58( const char* d, size_t s ); + std::vector from_base58( const std::string& base58_str ); + size_t from_base58( const std::string& base58_str, char* out_data, size_t out_data_len ); } diff --git a/src/crypto/base58.cpp b/src/crypto/base58.cpp index f86a983..71a7787 100644 --- a/src/crypto/base58.cpp +++ b/src/crypto/base58.cpp @@ -605,11 +605,11 @@ inline bool DecodeBase58(const std::string& str, std::vector& vch namespace fc { -fc::string to_base58( const char* d, size_t s ) { +std::string to_base58( const char* d, size_t s ) { return EncodeBase58( (const unsigned char*)d, (const unsigned char*)d+s ).c_str(); } -std::vector from_base58( const fc::string& base58_str ) { +std::vector from_base58( const std::string& base58_str ) { std::vector out; if( !DecodeBase58( base58_str.c_str(), out ) ) { FC_THROW_EXCEPTION( exception, "Unable to decode base58 string ${base58_str}", ("base58_str",base58_str) ); @@ -619,7 +619,7 @@ std::vector from_base58( const fc::string& base58_str ) { /** * @return the number of bytes decoded */ -size_t from_base58( const fc::string& base58_str, char* out_data, size_t out_data_len ) { +size_t from_base58( const std::string& base58_str, char* out_data, size_t out_data_len ) { //slog( "%s", base58_str.c_str() ); std::vector out; if( !DecodeBase58( base58_str.c_str(), out ) ) {