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

fix build

Browse source
This commit is contained in:
Daniel Larimer 2013-07-02 16:42:52 -04:00
parent 026f482251
commit af9288f5c3
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/fc/crypto/base58.hpp
View file

@ -2,7 +2,7 @@
#include <fc/string.hpp> #include <fc/string.hpp>
namespace fc { namespace fc {
fc::string to_base58( const char* d, size_t s ); std::string to_base58( const char* d, size_t s );
fc::vector<char> from_base58( const fc::string& base58_str ); std::vector<char> from_base58( const std::string& base58_str );
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 );
} }

6
src/crypto/base58.cpp
View file

@ -605,11 +605,11 @@ inline bool DecodeBase58(const std::string& str, std::vector<unsigned char>& vch
namespace fc { 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(); return EncodeBase58( (const unsigned char*)d, (const unsigned char*)d+s ).c_str();
} }
std::vector<char> from_base58( const fc::string& base58_str ) { std::vector<char> from_base58( const std::string& base58_str ) {
std::vector<unsigned char> out; std::vector<unsigned char> out;
if( !DecodeBase58( base58_str.c_str(), out ) ) { if( !DecodeBase58( base58_str.c_str(), out ) ) {
FC_THROW_EXCEPTION( exception, "Unable to decode base58 string ${base58_str}", ("base58_str",base58_str) ); FC_THROW_EXCEPTION( exception, "Unable to decode base58 string ${base58_str}", ("base58_str",base58_str) );
@ -619,7 +619,7 @@ std::vector<char> from_base58( const fc::string& base58_str ) {
/** /**
* @return the number of bytes decoded * @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() ); //slog( "%s", base58_str.c_str() );
std::vector<unsigned char> out; std::vector<unsigned char> out;
if( !DecodeBase58( base58_str.c_str(), out ) ) { if( !DecodeBase58( base58_str.c_str(), out ) ) {