diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-08-24 19:21:02 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-08-24 19:21:04 +0200 |
| commit | 6b7be9f89b17e353beee41015186076a848dab60 (patch) | |
| tree | ae4d2fd8af816d038951ea33fa441b034d5d3a38 /src/cryptonote_core | |
| parent | Merge pull request #381 (diff) | |
| parent | use correct unsigned type (diff) | |
| download | monero-6b7be9f89b17e353beee41015186076a848dab60.tar.xz | |
Merge pull request #383
3b5330e use correct unsigned type (roman)
59cc92b removed some gcc warnings. mainly unused variables. (roman)
Diffstat (limited to 'src/cryptonote_core')
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 3 | ||||
| -rw-r--r-- | src/cryptonote_core/cryptonote_format_utils.cpp | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index be0a4a6d7..24b82c520 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -2028,7 +2028,6 @@ bool Blockchain::check_tx_inputs(const transaction& tx, uint64_t* pmax_used_bloc return false; } - bool result; if (threads > 1) { // ND: Speedup @@ -2364,7 +2363,6 @@ bool Blockchain::handle_block_to_main_chain(const block& bl, const crypto::hash& uint64_t t_exists = 0; uint64_t t_pool = 0; uint64_t t_dblspnd = 0; - uint64_t t_cc; bool add_tx_to_pool = false; TIME_MEASURE_FINISH(t3); @@ -2679,7 +2677,6 @@ bool Blockchain::cleanup_handle_incoming_blocks(bool force_sync) LOG_PRINT_YELLOW("Blockchain::" << __func__, LOG_LEVEL_3); CRITICAL_REGION_LOCAL(m_blockchain_lock); TIME_MEASURE_START(t1); - auto height = m_db->height(); if (m_sync_counter > 0) { diff --git a/src/cryptonote_core/cryptonote_format_utils.cpp b/src/cryptonote_core/cryptonote_format_utils.cpp index cac51c042..b679eca50 100644 --- a/src/cryptonote_core/cryptonote_format_utils.cpp +++ b/src/cryptonote_core/cryptonote_format_utils.cpp @@ -433,7 +433,6 @@ namespace cryptonote if (get_encrypted_payment_id_from_tx_extra_nonce(extra_nonce.nonce, payment_id)) { LOG_PRINT_L2("Encrypting payment id " << payment_id); - crypto::key_derivation derivation; crypto::public_key view_key_pub = get_destination_view_key_pub(destinations, sender_account_keys); if (view_key_pub == null_pkey) { |