epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

fix PipelineServer

Browse Source
This commit is contained in:
Michael Davidsaver
2017-07-18 12:12:06 +02:00
parent 86da5c5d6b
commit d29e2f8dce
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pipelineService/pipelineServer.cpp
View File

@@ -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));
}

4
src/pipelineService/pv/pipelineServer.h
View File

@@ -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