diff options
| author | paybee <dev@payb.ee> | 2014-06-02 22:43:11 +0200 |
|---|---|---|
| committer | paybee <dev@payb.ee> | 2014-06-02 22:43:11 +0200 |
| commit | 133019cfc54f4842a030a346418056e513e6c581 (patch) | |
| tree | 3a03a4efe97972c0bcb46370d4ab5506051d8393 /src/cryptonote_core/miner.h | |
| parent | Added incoming_transfers RPC API method (diff) | |
| parent | Merge pull request #21 from Neozaru/master (diff) | |
| download | monero-133019cfc54f4842a030a346418056e513e6c581.tar.xz | |
fixed conflict
Diffstat (limited to 'src/cryptonote_core/miner.h')
| -rw-r--r-- | src/cryptonote_core/miner.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/cryptonote_core/miner.h b/src/cryptonote_core/miner.h index 61c063ddf..d9ac5a501 100644 --- a/src/cryptonote_core/miner.h +++ b/src/cryptonote_core/miner.h @@ -35,10 +35,12 @@ namespace cryptonote bool set_block_template(const block& bl, const difficulty_type& diffic, uint64_t height); bool on_block_chain_update(); bool start(const account_public_address& adr, size_t threads_count, const boost::thread::attributes& attrs); - uint64_t get_speed(); + uint64_t get_speed() const; + uint32_t get_threads_count() const; void send_stop_signal(); bool stop(); - bool is_mining(); + bool is_mining() const; + const account_public_address& get_mining_address() const; bool on_idle(); void on_synchronized(); //synchronous analog (for fast calls) |