Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

fixed compilation issues with windows/warning for paindroid

Browse source
This commit is contained in:
cryptozoidberg 2020-02-23 06:26:12 +01:00
parent 67b84d341d
commit 254a2dcb6e
No known key found for this signature in database
GPG key ID: 22DEB97A54C6FDEC
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/epee/include/storages/portable_storage_to_bin.h
View file

@ -37,7 +37,7 @@ namespace epee
{
template<class pack_value, class t_stream>
size_t pack_varint_t(t_stream& strm, uint8_t type_or, size_t& pv)
size_t pack_varint_t(t_stream& strm, uint8_t type_or, const uint64_t& pv)
{
pack_value v = (*((pack_value*)&pv)) << 2;
v |= type_or;
@ -48,7 +48,7 @@ namespace epee
PUSH_GCC_WARNINGS
DISABLE_GCC_WARNING(strict-aliasing)
template<class t_stream>
size_t pack_varint(t_stream& strm, size_t val)
size_t pack_varint(t_stream& strm, uint64_t val)
{ //the first two bits always reserved for size information
if(val <= 63)

10
src/wallet/plain_wallet_api.cpp
View file

@ -14,9 +14,11 @@ std::atomic<bool> initialized(false);
#define ANDROID_PACKAGE_NAME "com.zano_mobile"
#ifdef IOS_BUILD
#define HOME_FOLDER "Documents"
#define HOME_FOLDER "Documents"
#elif ANDROID_BUILD
#define HOME_FOLDER "files"
#define HOME_FOLDER "files"
#else
#define HOME_FOLDER ""
#endif
#define WALLETS_FOLDER_NAME "wallets"
@ -48,9 +50,10 @@ namespace plain_wallet
{
#ifdef WIN32
return "";
#endif // WIN32
#else
std::string path = get_bundle_root_dir() + "/" + HOME_FOLDER + "/" + WALLETS_FOLDER_NAME + "/";
return path;
#endif // WIN32
}
void initialize_logs()
@ -157,7 +160,6 @@ namespace plain_wallet
}
gwm.run_wallet(ok_response.result.wallet_id);
return epee::serialization::store_t_to_json(ok_response);
return;
}
error_response err_result = AUTO_VAL_INIT(err_result);
err_result.error.code = rsp;