diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-05-30 22:31:29 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-05-30 22:31:31 +0200 |
| commit | 26fac96c5d863ae89021e25f33f82123f0ae0c1e (patch) | |
| tree | 1aa2f6e40076bc321dfa0cae3f956038a51c1159 /src/blockchain_db/lmdb | |
| parent | Merge pull request #293 (diff) | |
| parent | rpc_command_executor: fix mining in testnet mode (diff) | |
| download | monero-26fac96c5d863ae89021e25f33f82123f0ae0c1e.tar.xz | |
Merge pull request #294
693a8bf rpc_command_executor: fix mining in testnet mode (moneromooo-monero)
d09be11 core_rpc_server: add a getter for the testnet flag (moneromooo-monero)
754f863 core_rpc_server: log some error messages to the console (moneromooo-monero)
4f0e8cf daemon: remove obsolete daemon_commands_handler.h (moneromooo-monero)
bac366e core_rpc_server: reenable print_pl (moneromooo-monero)
39a9508 net_peerlist: fix grayt/white naming mismatch (moneromooo-monero)
8069b3b blockchain_db: add a few const (moneromooo-monero)
0932476 wallet: add consts where appropriate (moneromooo-monero)
Diffstat (limited to 'src/blockchain_db/lmdb')
| -rw-r--r-- | src/blockchain_db/lmdb/db_lmdb.cpp | 6 | ||||
| -rw-r--r-- | src/blockchain_db/lmdb/db_lmdb.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/blockchain_db/lmdb/db_lmdb.cpp b/src/blockchain_db/lmdb/db_lmdb.cpp index 7d06ae57a..4ea349f7f 100644 --- a/src/blockchain_db/lmdb/db_lmdb.cpp +++ b/src/blockchain_db/lmdb/db_lmdb.cpp @@ -212,7 +212,7 @@ void mdb_txn_safe::abort() } } -uint64_t mdb_txn_safe::num_active_tx() +uint64_t mdb_txn_safe::num_active_tx() const { return num_active_txns; } @@ -273,7 +273,7 @@ void BlockchainLMDB::do_resize() mdb_txn_safe::allow_new_txns(); } -bool BlockchainLMDB::need_resize() +bool BlockchainLMDB::need_resize() const { MDB_envinfo mei; @@ -668,7 +668,7 @@ void BlockchainLMDB::remove_spent_key(const crypto::key_image& k_image) throw1(DB_ERROR("Error adding removal of key image to db transaction")); } -blobdata BlockchainLMDB::output_to_blob(const tx_out& output) +blobdata BlockchainLMDB::output_to_blob(const tx_out& output) const { LOG_PRINT_L3("BlockchainLMDB::" << __func__); blobdata b; diff --git a/src/blockchain_db/lmdb/db_lmdb.h b/src/blockchain_db/lmdb/db_lmdb.h index ec552a0f6..6a2646816 100644 --- a/src/blockchain_db/lmdb/db_lmdb.h +++ b/src/blockchain_db/lmdb/db_lmdb.h @@ -59,7 +59,7 @@ struct mdb_txn_safe return &m_txn; } - uint64_t num_active_tx(); + uint64_t num_active_tx() const; static void prevent_new_txns(); static void wait_no_active_txns(); @@ -201,7 +201,7 @@ public: private: void do_resize(); - bool need_resize(); + bool need_resize() const; virtual void add_block( const block& blk , const size_t& block_size @@ -236,7 +236,7 @@ private: * * @return the resultant blob */ - blobdata output_to_blob(const tx_out& output); + blobdata output_to_blob(const tx_out& output) const; /** * @brief convert a tx output blob to a tx output |