diff options
author | Dion Ahmetaj <Dion Ahmetaj> | 2017-02-14 18:50:53 -0500 |
---|---|---|
committer | Dion Ahmetaj <Dion Ahmetaj> | 2017-02-15 11:15:12 -0500 |
commit | a493c0b196e2517d660043f3723dd0b81c19b9ed (patch) | |
tree | 281502d3fb633609844e28874265ed1592edb6c1 | |
parent | Merge pull request #1719 (diff) | |
download | monero-a493c0b196e2517d660043f3723dd0b81c19b9ed.tar.xz |
BACKGROUND_MINING_MINER_MONITOR_INVERVAL_IN_SECONDS was odr-used, so required a definition.
Instead of adding a declaration to cpp file, I changed it to non odr-used.
-rw-r--r-- | src/cryptonote_basic/miner.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/cryptonote_basic/miner.cpp b/src/cryptonote_basic/miner.cpp index 117c81878..9a982ca9f 100644 --- a/src/cryptonote_basic/miner.cpp +++ b/src/cryptonote_basic/miner.cpp @@ -564,10 +564,9 @@ namespace cryptonote // If we're already mining, then sleep for the miner monitor interval. // If we're NOT mining, then sleep for the idle monitor interval - boost::this_thread::sleep_for( - m_is_background_mining_started ? - boost::chrono::seconds( BACKGROUND_MINING_MINER_MONITOR_INVERVAL_IN_SECONDS ) : - boost::chrono::seconds( get_min_idle_seconds() ) ); + uint64_t sleep_for_seconds = BACKGROUND_MINING_MINER_MONITOR_INVERVAL_IN_SECONDS; + if( !m_is_background_mining_started ) sleep_for_seconds = get_min_idle_seconds(); + boost::this_thread::sleep_for(boost::chrono::seconds(sleep_for_seconds)); } catch(const boost::thread_interrupted&) { |