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

Merge pull request #32 from anjohnson/master

Browse Source 
Fix master build
This commit is contained in:
Marty Kraimer
2018-02-06 06:23:26 -05:00
committed by GitHub
parent e0cb7d7f93 e31aae5f5d
commit 83101e210a
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pv/pvDatabase.h
View File

@ -112,10 +112,10 @@ public:
* @param pvRequest The request PVStructure * @param pvRequest The request PVStructure
* @return The corresponding service * @return The corresponding service
*/ */
virtual epics::pvAccess::Service::shared_pointer getService( virtual epics::pvAccess::RPCServiceAsync::shared_pointer getService(
epics::pvData::PVStructurePtr const & pvRequest) epics::pvData::PVStructurePtr const & pvRequest)
{ {
return epics::pvAccess::Service::shared_pointer(); return epics::pvAccess::RPCServiceAsync::shared_pointer();
} }
/** /**
* @brief Creates a <b>soft</b> record. * @brief Creates a <b>soft</b> record.

6
src/pvAccess/channelLocal.cpp
View File

@ -691,7 +691,7 @@ public:
ChannelRPCLocal( ChannelRPCLocal(
ChannelLocalPtr const & channelLocal, ChannelLocalPtr const & channelLocal,
ChannelRPCRequester::shared_pointer const & channelRPCRequester, ChannelRPCRequester::shared_pointer const & channelRPCRequester,
Service::shared_pointer const & service, RPCServiceAsync::shared_pointer const & service,
PVRecordPtr const & pvRecord) : PVRecordPtr const & pvRecord) :
channelLocal(channelLocal), channelLocal(channelLocal),
channelRPCRequester(channelRPCRequester), channelRPCRequester(channelRPCRequester),
@ -752,7 +752,7 @@ private:
ChannelLocalPtr channelLocal; ChannelLocalPtr channelLocal;
ChannelRPCRequester::weak_pointer channelRPCRequester; ChannelRPCRequester::weak_pointer channelRPCRequester;
Service::shared_pointer service; RPCServiceAsync::shared_pointer service;
PVRecordPtr pvRecord; PVRecordPtr pvRecord;
AtomicBoolean isLastRequest; AtomicBoolean isLastRequest;
}; };
@ -763,7 +763,7 @@ ChannelRPCLocalPtr ChannelRPCLocal::create(
PVStructurePtr const & pvRequest, PVStructurePtr const & pvRequest,
PVRecordPtr const &pvRecord) PVRecordPtr const &pvRecord)
{ {
Service::shared_pointer service = pvRecord->getService(pvRequest); RPCServiceAsync::shared_pointer service = pvRecord->getService(pvRequest);
if (!service) if (!service)
{ {
Status status(Status::STATUSTYPE_ERROR, Status status(Status::STATUSTYPE_ERROR,

1
test/src/testPVAServer.cpp
View File

@ -67,7 +67,6 @@ static void test()
ServerContext::shared_pointer ctx = ServerContext::shared_pointer ctx =
startPVAServer("local",0,true,true); startPVAServer("local",0,true,true);
testOk1(ctx.get()!=0); testOk1(ctx.get()!=0);
ctx->destroy();
} }
MAIN(testPVAServer) MAIN(testPVAServer)