another attempt to fix jenkins_problem

This commit is contained in:
mrkraimer
2021-04-03 07:14:31 -04:00
parent 2c4e98db8c
commit e91b4b1b66

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: