Merge pull request #1253

3094670 daemon: even when switching branches, compile the damn thing ffs (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-10-23 21:25:32 +02:00
commit 18e406a0e6
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -873,7 +873,7 @@ bool t_rpc_command_executor::print_transaction_pool_stats() {
if (tx_info.last_failed_height) if (tx_info.last_failed_height)
++n_failing; ++n_failing;
} }
size_t n_transactions ? avg_bytes = bytes / n_transactions : 0; size_t avg_bytes = n_transactions ? bytes / n_transactions : 0;
tools::msg_writer() << n_transactions << " tx(es), " << bytes << " bytes total (min " << min_bytes << ", max " << max_bytes << ", avg " << avg_bytes << ")" << std::endl tools::msg_writer() << n_transactions << " tx(es), " << bytes << " bytes total (min " << min_bytes << ", max " << max_bytes << ", avg " << avg_bytes << ")" << std::endl
<< "fees " << cryptonote::print_money(fee) << " (avg " << cryptonote::print_money(n_transactions ? fee / n_transactions : 0) << " per tx)" << std::endl << "fees " << cryptonote::print_money(fee) << " (avg " << cryptonote::print_money(n_transactions ? fee / n_transactions : 0) << " per tx)" << std::endl