Fix forgotten std::parts. move recusive from details to spdlog namespace.

pull/793/head
Gabor Janak 7 years ago
parent e32c0596ad
commit 440e0302f5

@ -40,7 +40,7 @@ struct async_factory_impl
auto &registry_inst = details::registry::instance();
// create global thread pool if not already exists..
lock_guard<std::recursive_mutex> tp_lock(registry_inst.tp_mutex());
lock_guard<recursive_mutex> tp_lock(registry_inst.tp_mutex());
auto tp = registry_inst.get_tp();
if (tp == nullptr)
{

@ -81,19 +81,19 @@ class sink;
// import into namespace spdlog
namespace details {
using boost::condition_variable;
using boost::recursive_mutex;
using boost::thread;
using boost::unique_lock;
} // namespace details
using boost::recursive_mutex;
using boost::lock_guard;
using boost::mutex;
#else
namespace details {
using std::condition_variable;
using std::recursive_mutex;
using std::thread;
using std::unique_lock;
} // namespace details
using std::recursive_mutex;
using std::lock_guard;
using std::mutex;
#endif

@ -73,7 +73,7 @@ public:
// try to enqueue and block if no room left
void enqueue(T &&item)
{
std::unique_lock<mutex> lock(queue_mutex_);
unique_lock<mutex> lock(queue_mutex_);
pop_cv_.wait(lock, [this] { return !this->q_.full(); });
q_.push_back(std::move(item));
push_cv_.notify_one();
@ -82,7 +82,7 @@ public:
// enqueue immediately. overrun oldest message in the queue if no room left.
void enqueue_nowait(T &&item)
{
std::unique_lock<mutex> lock(queue_mutex_);
unique_lock<mutex> lock(queue_mutex_);
q_.push_back(std::move(item));
push_cv_.notify_one();
}
@ -91,7 +91,7 @@ public:
// Return true, if succeeded dequeue item, false otherwise
bool dequeue_for(T &popped_item, chrono::milliseconds wait_duration)
{
std::unique_lock<mutex> lock(queue_mutex_);
unique_lock<mutex> lock(queue_mutex_);
if (!push_cv_.wait_for(lock, wait_duration, [this] { return !this->q_.empty(); }))
{
return false;

Loading…
Cancel
Save