diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-10-10 15:47:08 +0100 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-11-14 16:56:10 +0000 |
| commit | 383ff4f68943c5d998fba8caa20aee481583f214 (patch) | |
| tree | 23eefe275400a75af13faa49af8198ba3ab1183c /src/blockchain_db | |
| parent | Merge pull request #2720 (diff) | |
| download | monero-383ff4f68943c5d998fba8caa20aee481583f214.tar.xz | |
remove "using namespace std" from headers
It's nasty, and actually breaks on Solaris, where if.h fails to
build due to:
struct map *if_memmap;
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 6ebb35639..6023b5ce1 100644 --- a/src/blockchain_db/lmdb/db_lmdb.cpp +++ b/src/blockchain_db/lmdb/db_lmdb.cpp @@ -48,6 +48,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. |