diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-11-14 21:29:49 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-11-14 21:29:49 +0200 |
| commit | 5de492be40e9d55a9b432b562c72e933d0df0efb (patch) | |
| tree | 46d23b2a38a41bbc6f1786f6c97413c1de3aefb5 /src/blockchain_db | |
| parent | Merge pull request #2756 (diff) | |
| parent | remove "using namespace std" from headers (diff) | |
| download | monero-5de492be40e9d55a9b432b562c72e933d0df0efb.tar.xz | |
Merge pull request #2629
383ff4f6 remove "using namespace std" from headers (moneromooo-monero)
Diffstat (limited to 'src/blockchain_db')
| -rw-r--r-- | src/blockchain_db/blockchain_db.cpp | 2 | ||||
| -rw-r--r-- | src/blockchain_db/lmdb/db_lmdb.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/blockchain_db/blockchain_db.cpp b/src/blockchain_db/blockchain_db.cpp index d62a250ff..c3f6e3d87 100644 --- a/src/blockchain_db/blockchain_db.cpp +++ b/src/blockchain_db/blockchain_db.cpp @@ -208,7 +208,7 @@ uint64_t BlockchainDB::add_block( const block& blk time1 = epee::misc_utils::get_tick_count(); add_transaction(blk_hash, blk.miner_tx); int tx_i = 0; - crypto::hash tx_hash = null_hash; + crypto::hash tx_hash = crypto::null_hash; for (const transaction& tx : txs) { tx_hash = blk.tx_hashes[tx_i]; diff --git a/src/blockchain_db/lmdb/db_lmdb.cpp b/src/blockchain_db/lmdb/db_lmdb.cpp index 6cf74b3b0..865558e07 100644 --- a/src/blockchain_db/lmdb/db_lmdb.cpp +++ b/src/blockchain_db/lmdb/db_lmdb.cpp @@ -49,6 +49,7 @@ #endif using epee::string_tools::pod_to_hex; +using namespace crypto; // Increase when the DB changes in a non backward compatible way, and there // is no automatic conversion, so that a full resync is needed. |