From d29e2f8dcebbb3de8c4363f613d891094f4f5d53 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Tue, 18 Jul 2017 12:12:06 +0200
Subject: [PATCH] fix PipelineServer

---
 src/pipelineService/pipelineServer.cpp  | 10 +---------
 src/pipelineService/pv/pipelineServer.h |  4 +++-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/pipelineService/pipelineServer.cpp b/src/pipelineService/pipelineServer.cpp
index 82cfc9e..4edf983 100644
--- a/src/pipelineService/pipelineServer.cpp
+++ b/src/pipelineService/pipelineServer.cpp
@@ -446,9 +446,6 @@ Channel::shared_pointer createPipelineChannel(ChannelProvider::shared_pointer co
     return channel;
 }
 
-}} // epics::pvAccess
-namespace {
-
 class PipelineChannelProvider :
     public virtual ChannelProvider,
     public virtual ChannelFind,
@@ -625,14 +622,9 @@ private:
 string PipelineChannelProvider::PROVIDER_NAME("PipelineService");
 Status PipelineChannelProvider::noSuchChannelStatus(Status::STATUSTYPE_ERROR, "no such channel");
 
-} //namespace
-
-namespace epics {
-namespace pvAccess {
-
 PipelineServer::PipelineServer()
+    :m_channelProviderImpl(new PipelineChannelProvider)
 {
-    ChannelProvider::shared_pointer prov(new PipelineChannelProvider);
     m_serverContext = ServerContext::create(ServerContext::Config()
                                             .provider(m_channelProviderImpl));
 }
diff --git a/src/pipelineService/pv/pipelineServer.h b/src/pipelineService/pv/pipelineServer.h
index 0198b30..b4bcbcb 100644
--- a/src/pipelineService/pv/pipelineServer.h
+++ b/src/pipelineService/pv/pipelineServer.h
@@ -28,13 +28,15 @@
 namespace epics {
 namespace pvAccess {
 
+class PipelineChannelProvider;
+
 class epicsShareClass PipelineServer :
     public std::tr1::enable_shared_from_this<PipelineServer>
 {
 private:
 
     ServerContext::shared_pointer m_serverContext;
-    ChannelProvider::shared_pointer m_channelProviderImpl;
+    std::tr1::shared_ptr<PipelineChannelProvider> m_channelProviderImpl;
 
     // TODO no thread poll implementation