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/db_lmdb.h | |
| 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/db_lmdb.h')
| -rw-r--r-- | src/blockchain_db/lmdb/db_lmdb.h | 6 |
1 files changed, 3 insertions, 3 deletions
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 |