diff --git a/libraries/fc/src/thread/thread.cpp b/libraries/fc/src/thread/thread.cpp index 73bf67ae83..5240702a31 100644 --- a/libraries/fc/src/thread/thread.cpp +++ b/libraries/fc/src/thread/thread.cpp @@ -347,7 +347,7 @@ namespace fc { } void thread::poke() { - boost::unique_lock lock(my->task_ready_mutex); + std::unique_lock lock(my->task_ready_mutex); my->task_ready.notify_one(); } @@ -364,7 +364,7 @@ namespace fc { // to aquire the lock and therefore there should be no contention on this lock except // when *this thread is about to block on a wait condition. if( this != ¤t() && !stale_head ) { - boost::unique_lock lock(my->task_ready_mutex); + std::unique_lock lock(my->task_ready_mutex); my->task_ready.notify_one(); } } diff --git a/libraries/fc/src/thread/thread_d.hpp b/libraries/fc/src/thread/thread_d.hpp index 4d69aebba7..d46c0e6ee3 100644 --- a/libraries/fc/src/thread/thread_d.hpp +++ b/libraries/fc/src/thread/thread_d.hpp @@ -3,7 +3,7 @@ #include #include #include "context.hpp" -#include +#include #include #include #include @@ -75,8 +75,8 @@ namespace fc { fc::thread& self; boost::thread* boost_thread; stack_allocator stack_alloc; - boost::condition_variable task_ready; - boost::mutex task_ready_mutex; + std::condition_variable task_ready; + std::mutex task_ready_mutex; boost::atomic task_in_queue; std::vector task_pqueue; // heap of tasks that have never started, ordered by proirity & scheduling time @@ -582,7 +582,7 @@ namespace fc { clear_free_list(); { // lock scope - boost::unique_lock lock(task_ready_mutex); + std::unique_lock lock(task_ready_mutex); if( has_next_task() ) continue; time_point timeout_time = check_for_timeouts(); @@ -613,8 +613,8 @@ namespace fc { * that takes an absolute time like fc::promise::wait_until(), so we can't always * do the right thing here. */ - task_ready.wait_until( lock, boost::chrono::steady_clock::now() + - boost::chrono::microseconds(timeout_time.time_since_epoch().count() - time_point::now().time_since_epoch().count()) ); + task_ready.wait_until( lock, std::chrono::steady_clock::now() + + std::chrono::microseconds(timeout_time.time_since_epoch().count() - time_point::now().time_since_epoch().count()) ); } } }