BlockStorage/siadrive
Archived
1
0
Fork 0
Code Activity

Dunno

Browse Source
This commit is contained in:
Scott E. Graves
2017-05-09 22:32:50 -05:00
parent c9c8c8f531
commit 6c1776945f
5 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/siadrive_api/siatransaction.h
View File

@@ -42,14 +42,13 @@ public:
typedef std::shared_ptr<CSiaOutput> CSiaOutputPtr;
public:
CSiaTransaction(const json& _json);
CSiaTransaction(const json& json);
private:
json _json;
JProperty2(std::uint64_t, ConfirmationTimeStamp, confirmationtimestamp, public, private, _json)
JProperty2(std::uint64_t, ConfirmationHeight, confirmationheight, public, private, _json)
JProperty2(std::string, Transaction, transaction, public, private, _json)
JProperty2(std::string, TransactionId, transactionid, public, private, _json)
Property(std::vector<CSiaInputPtr>, Inputs, public, private)
Property(std::vector<CSiaOutputPtr>, Outputs, public, private)

16
include/siadrive_api/sstring.h
View File

@@ -84,14 +84,22 @@ public:
static inline std::string ToUtf8(const std::wstring &str)
{
std::wstring_convert<deletable_facet<std::codecvt<wchar_t, char, std::mbstate_t>>, wchar_t> conv;
return conv.to_bytes(str);
if (str.length())
{
std::wstring_convert<deletable_facet<std::codecvt<wchar_t, char, std::mbstate_t>>, wchar_t> conv;
return conv.to_bytes(str);
}
return "";
}
static inline std::wstring FromUtf8(const std::string &str)
{
std::wstring_convert<deletable_facet<std::codecvt<wchar_t, char, std::mbstate_t>>, wchar_t> conv;
return conv.from_bytes(str);
if (str.length())
{
std::wstring_convert<deletable_facet<std::codecvt<wchar_t, char, std::mbstate_t>>, wchar_t> conv;
return conv.from_bytes(str);
}
return L"";
}
static inline String &LeftTrim(String &s)