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

change ChannelConnectThread to channelConnectThread

Browse Source
This commit is contained in:
mrkraimer
2018-08-10 15:11:02 -04:00
parent 16268cc9d6
commit 39ede57fe2
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ca/caChannel.cpp
View File

@@ -63,7 +63,7 @@ void CAChannel::connected()
if(DEBUG_LEVEL>0) {
cout<< "CAChannel::connected " << channelName << endl;
}
ChannelConnectThread->channelConnected(notifyChannelRequester);
channelConnectThread->channelConnected(notifyChannelRequester);
}
void CAChannel::notifyClient()
@@ -113,7 +113,7 @@ CAChannel::CAChannel(std::string const & channelName,
channelRequester(channelRequester),
channelID(0),
channelCreated(false),
ChannelConnectThread(ChannelConnectThread::get())
channelConnectThread(ChannelConnectThread::get())
{
if(DEBUG_LEVEL>0) {
cout<< "CAChannel::CAChannel " << channelName << endl;
@@ -487,6 +487,9 @@ void CAChannelGet::getDone(struct event_handler_args &args)
void CAChannelGet::notifyClient()
{
if(DEBUG_LEVEL>1) {
std::cout << "CAChannelGet::notifyClient " << channel->getChannelName() << endl;
}
ChannelGetRequester::shared_pointer getRequester(channelGetRequester.lock());
if(!getRequester) return;
EXCEPTION_GUARD(getRequester->getDone(getStatus, shared_from_this(), pvStructure, bitSet));