From 68b5966fefebd1c7f62f6bbf749f93fca0ead001 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Fri, 25 Oct 2013 16:36:36 -0700 Subject: [PATCH] Move ServiceQueueBase out of detail namespace --- beast/threads/ServiceQueue.h | 6 +++--- beast/threads/impl/ServiceQueue.cpp | 9 +-------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/beast/threads/ServiceQueue.h b/beast/threads/ServiceQueue.h index 2b2cb3bea..115737c83 100644 --- a/beast/threads/ServiceQueue.h +++ b/beast/threads/ServiceQueue.h @@ -328,6 +328,8 @@ private: #endif +} + //------------------------------------------------------------------------------ class ServiceQueueBase @@ -399,8 +401,6 @@ protected: static ThreadLocalValue s_service; }; -} - //------------------------------------------------------------------------------ /** A queue for disatching function calls on other threads. @@ -408,7 +408,7 @@ protected: calling run, run_one, poll, or poll_one. */ template > -class ServiceQueueType : public detail::ServiceQueueBase +class ServiceQueueType : public ServiceQueueBase { private: using ServiceQueueBase::Item; diff --git a/beast/threads/impl/ServiceQueue.cpp b/beast/threads/impl/ServiceQueue.cpp index f82368c49..1facf600b 100644 --- a/beast/threads/impl/ServiceQueue.cpp +++ b/beast/threads/impl/ServiceQueue.cpp @@ -23,10 +23,6 @@ namespace beast { -namespace detail { - -//------------------------------------------------------------------------------ - class ServiceQueueBase::ScopedServiceThread : public List ::Node { public: @@ -189,12 +185,9 @@ void ServiceQueueBase::enqueue (Item* item) // ThreadLocalValue ServiceQueueBase::s_service; -} - //------------------------------------------------------------------------------ -namespace detail -{ +namespace detail { //------------------------------------------------------------------------------