From 52530e2a334ab3e443f1e1cdc942d515a354b20e Mon Sep 17 00:00:00 2001 From: Roker Date: Thu, 25 Oct 2018 17:46:48 +0200 Subject: [PATCH] remove "locked_queue" and from public Adapter.hh API, because not necessary there. --- Adapter.hh | 2 -- Adapter.hxx | 10 ++++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Adapter.hh b/Adapter.hh index 6123d0f..90a7b5a 100644 --- a/Adapter.hh +++ b/Adapter.hh @@ -3,8 +3,6 @@ #pragma once -#include "locked_queue.hh" -#include #include #include #include diff --git a/Adapter.hxx b/Adapter.hxx index 3fb539b..4d14a9a 100644 --- a/Adapter.hxx +++ b/Adapter.hxx @@ -1,11 +1,13 @@ #pragma once -#include +#include +#include "locked_queue.hh" -using namespace std; namespace pEp { namespace Adapter { + using std::function; + extern messageToSend_t _messageToSend; extern notifyHandshake_t _notifyHandshake; extern std::thread *_sync_thread; @@ -50,10 +52,10 @@ namespace pEp { session(); { - lock_guard lock(m); + std::lock_guard lock(m); if (!_sync_thread) - _sync_thread = new thread(sync_thread, obj, _startup, _shutdown); + _sync_thread = new std::thread(sync_thread, obj, _startup, _shutdown); } } }