d0s3t3ch/wownero
1
0
Fork 0
mirror of https://git.wownero.com/wownero/wownero.git synced 2024-08-15 01:03:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3851

Browse source 
a87980f fix build with GCC 8.1.0 (moneromooo-monero)
This commit is contained in:
luigi1111 2018-06-19 12:51:13 -05:00
commit 9a3bd88b9f
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cryptonote_basic/account.cpp
View file

@ -157,7 +157,7 @@ DISABLE_VS_WARNINGS(4244 4345)
void account_base::create_from_viewkey(const cryptonote::account_public_address& address, const crypto::secret_key& viewkey) void account_base::create_from_viewkey(const cryptonote::account_public_address& address, const crypto::secret_key& viewkey)
{ {
crypto::secret_key fake; crypto::secret_key fake;
memset(&fake, 0, sizeof(fake)); memset(&unwrap(fake), 0, sizeof(fake));
create_from_keys(address, fake, viewkey); create_from_keys(address, fake, viewkey);
} }
//----------------------------------------------------------------- //-----------------------------------------------------------------

2
src/daemon/rpc_command_executor.cpp
View file

@ -976,7 +976,7 @@ bool t_rpc_command_executor::print_transaction_pool_stats() {
} }
else else
{ {
memset(&res.pool_stats, 0, sizeof(res.pool_stats)); res.pool_stats = {};
if (!m_rpc_server->on_get_transaction_pool_stats(req, res, false) || res.status != CORE_RPC_STATUS_OK) if (!m_rpc_server->on_get_transaction_pool_stats(req, res, false) || res.status != CORE_RPC_STATUS_OK)
{ {
tools::fail_msg_writer() << make_error(fail_message, res.status); tools::fail_msg_writer() << make_error(fail_message, res.status);

2
src/rpc/core_rpc_server_commands_defs.h
View file

@ -1565,6 +1565,8 @@ namespace cryptonote
std::vector<txpool_histo> histo; std::vector<txpool_histo> histo;
uint32_t num_double_spends; uint32_t num_double_spends;
txpool_stats(): bytes_total(0), bytes_min(0), bytes_max(0), bytes_med(0), fee_total(0), oldest(0), txs_total(0), num_failing(0), num_10m(0), num_not_relayed(0), histo_98pc(0), num_double_spends(0) {}
BEGIN_KV_SERIALIZE_MAP() BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(bytes_total) KV_SERIALIZE(bytes_total)
KV_SERIALIZE(bytes_min) KV_SERIALIZE(bytes_min)