From: James Wise Date: Fri, 10 Feb 2017 02:27:45 +0000 (+1100) Subject: fix spl v std typo X-Git-Tag: 2.1.0_Beta2~48^2^2~7 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=6f22ab2213c8c029491ab528a0d16a9ca256bc57;p=casparcg fix spl v std typo --- diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp index 9ca4c9a5b..6d204bf34 100644 --- a/modules/bluefish/consumer/bluefish_consumer.cpp +++ b/modules/bluefish/consumer/bluefish_consumer.cpp @@ -135,7 +135,6 @@ struct bluefish_consumer : boost::noncopyable std::array all_frames_; std::queue reserved_frames_; - std::mutex reserved_frames_lock_; std::queue live_frames_; std::mutex live_frames_lock_; std::shared_ptr dma_present_thread_; @@ -581,7 +580,7 @@ public: if (dma_present_thread_ == 0) { end_dma_thread_ = false; - dma_present_thread_ = spl::make_shared(&dma_present_thread_actual, this); + dma_present_thread_ = std::make_shared(&dma_present_thread_actual, this); #if defined(_WIN32) HANDLE handle = (HANDLE)dma_present_thread_->native_handle(); SetThreadPriority(handle, THREAD_PRIORITY_HIGHEST);