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

Merge pull request #68 from epics-base/jenkins_problem

Browse Source 
another attempt to fix jenkins_problem
This commit is contained in:
Marty Kraimer
2021-04-03 08:59:19 -04:00
committed by GitHub
parent d4a13397d7 e91b4b1b66
commit 716ec9857c
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile
View File

@ -24,8 +24,8 @@ INC += pv/scalarAlarmSupport.h
include $(PVDATABASE_SRC)/copy/Makefile include $(PVDATABASE_SRC)/copy/Makefile
include $(PVDATABASE_SRC)/database/Makefile include $(PVDATABASE_SRC)/database/Makefile
include $(PVDATABASE_SRC)/pvAccess/Makefile include $(PVDATABASE_SRC)/pvAccess/Makefile
include $(PVDATABASE_SRC)/special/Makefile
include $(PVDATABASE_SRC)/support/Makefile include $(PVDATABASE_SRC)/support/Makefile
include $(PVDATABASE_SRC)/special/Makefile
LIBRARY += pvDatabase LIBRARY += pvDatabase
pvDatabase_LIBS += pvData pvDatabase_LIBS += pvData

14
src/pvAccess/channelLocal.cpp
View File

@ -77,7 +77,7 @@ static bool getProcess(PVStructurePtr pvRequest,bool processDefault)
} }
class ChannelProcessLocal : class ChannelProcessLocal :
public ChannelProcess, public epics::pvAccess::ChannelProcess,
public std::tr1::enable_shared_from_this<ChannelProcessLocal> public std::tr1::enable_shared_from_this<ChannelProcessLocal>
{ {
public: public:
@ -206,7 +206,7 @@ void ChannelProcessLocal::process()
} }
class ChannelGetLocal : class ChannelGetLocal :
public ChannelGet, public epics::pvAccess::ChannelGet,
public std::tr1::enable_shared_from_this<ChannelGetLocal> public std::tr1::enable_shared_from_this<ChannelGetLocal>
{ {
public: public:
@ -383,7 +383,7 @@ void ChannelGetLocal::get()
} }
class ChannelPutLocal : class ChannelPutLocal :
public ChannelPut, public epics::pvAccess::ChannelPut,
public std::tr1::enable_shared_from_this<ChannelPutLocal> public std::tr1::enable_shared_from_this<ChannelPutLocal>
{ {
public: public:
@ -567,7 +567,7 @@ void ChannelPutLocal::put(
class ChannelPutGetLocal : class ChannelPutGetLocal :
public ChannelPutGet, public epics::pvAccess::ChannelPutGet,
public std::tr1::enable_shared_from_this<ChannelPutGetLocal> public std::tr1::enable_shared_from_this<ChannelPutGetLocal>
{ {
public: public:
@ -802,8 +802,8 @@ void ChannelPutGetLocal::getGet()
class ChannelRPCLocal : class ChannelRPCLocal :
public ChannelRPC, public epics::pvAccess::ChannelRPC,
public RPCResponseCallback, public epics::pvAccess::RPCResponseCallback,
public std::tr1::enable_shared_from_this<ChannelRPCLocal> public std::tr1::enable_shared_from_this<ChannelRPCLocal>
{ {
public: public:
@ -993,7 +993,7 @@ void ChannelRPCLocal::request(PVStructurePtr const & pvArgument)
typedef std::tr1::shared_ptr<PVArray> PVArrayPtr; typedef std::tr1::shared_ptr<PVArray> PVArrayPtr;
class ChannelArrayLocal : class ChannelArrayLocal :
public ChannelArray, public epics::pvAccess::ChannelArray,
public std::tr1::enable_shared_from_this<ChannelArrayLocal> public std::tr1::enable_shared_from_this<ChannelArrayLocal>
{ {
public: public: