Merge pull request #712

66c2fc7 Need to link boost::chrono in more places now (Howard Chu)
b937a2c Use boost::thread instead of std::thread (Howard Chu)

1 files changed, 3 insertions, 3 deletions

diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index 2aa8ecec4..f540697dc 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -2105,7 +2105,7 @@ bool Blockchain::check_tx_inputs(const transaction& tx, uint64_t* pmax_used_bloc
   std::vector < uint64_t > results;
   results.resize(tx.vin.size(), 0);
 
-  int threads = std::thread::hardware_concurrency();
+  int threads = boost::thread::hardware_concurrency();
 
   boost::asio::io_service ioservice;
   boost::thread_group threadpool;
@@ -2965,7 +2965,7 @@ bool Blockchain::prepare_handle_incoming_blocks(const std::list<block_complete_e
     return true;
 
   bool blocks_exist = false;
-  uint64_t threads = std::thread::hardware_concurrency();
+  uint64_t threads = boost::thread::hardware_concurrency();
 
   if (blocks_entry.size() > 1 && threads > 1 && m_max_prepare_blocks_threads > 1)
   {
@@ -3165,7 +3165,7 @@ bool Blockchain::prepare_handle_incoming_blocks(const std::list<block_complete_e
   // [output] stores all transactions for each tx_out_index::hash found
   std::vector<std::unordered_map<crypto::hash, cryptonote::transaction>> transactions(amounts.size());
 
-  threads = std::thread::hardware_concurrency();
+  threads = boost::thread::hardware_concurrency();
   if (!m_db->can_thread_bulk_indices())
     threads = 1;