Move from boost::thread to std::thread for nearly everything.

[casparcg] / core / producer / cg_proxy.cpp

diff --git a/core/producer/cg_proxy.cpp b/core/producer/cg_proxy.cpp
index df8578ee44eb3937ac83416074910eaceb1a76f8..bda54ae771fcd9a6ced34d736f5b6f5055158a1d 100644 (file)
--- a/core/producer/cg_proxy.cpp
+++ b/core/producer/cg_proxy.cpp
@@ -37,8 +37,6 @@
 #include <common/os/filesystem.h>
 #include <common/future.h>
 
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/lock_guard.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/optional.hpp>
@@ -84,7 +82,7 @@ private:
                bool                                    reusable_producer_instance;
        };
 
-       mutable boost::mutex                    mutex_;
+       mutable std::mutex                      mutex_;
        std::map<std::wstring, record>  records_by_extension_;
 public:
        void register_cg_producer(
@@ -95,7 +93,7 @@ public:
                        cg_producer_factory producer_factory,
                        bool reusable_producer_instance)
        {
-               boost::lock_guard<boost::mutex> lock(mutex_);
+               std::lock_guard<std::mutex> lock(mutex_);
 
                record rec
                {
@@ -128,7 +126,7 @@ public:
        {
                auto producer_name = producer->name();
 
-               boost::lock_guard<boost::mutex> lock(mutex_);
+               std::lock_guard<std::mutex> lock(mutex_);
 
                for (auto& elem : records_by_extension_)
                {
@@ -185,7 +183,7 @@ public:
 
                auto basepath = path(env::template_folder()) / path(filename);
 
-               boost::lock_guard<boost::mutex> lock(mutex_);
+               std::lock_guard<std::mutex> lock(mutex_);
 
                for (auto& rec : records_by_extension_)
                {
@@ -201,7 +199,7 @@ public:
 
        bool is_cg_extension(const std::wstring& extension) const
        {
-               boost::lock_guard<boost::mutex> lock(mutex_);
+               std::lock_guard<std::mutex> lock(mutex_);
 
                return records_by_extension_.find(extension) != records_by_extension_.end();
        }
@@ -222,7 +220,7 @@ private:
 
                auto basepath = path(env::template_folder()) / path(filename);
 
-               boost::lock_guard<boost::mutex> lock(mutex_);
+               std::lock_guard<std::mutex> lock(mutex_);
 
                for (auto& rec : records_by_extension_)
                {