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

caProvider: Minor cleanup

Browse Source
This commit is contained in:
Andrew Johnson
2021-10-01 09:54:48 -05:00
parent 161eac3a38
commit 99432d6809
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ca/caChannel.cpp
View File

@@ -159,7 +159,7 @@ void CAChannel::disconnectChannel()
} }
std::vector<CAChannelMonitorWPtr>::iterator it; std::vector<CAChannelMonitorWPtr>::iterator it;
for (it = monitorlist.begin(); it!=monitorlist.end(); ++it) { for (it = monitorlist.begin(); it!=monitorlist.end(); ++it) {
CAChannelMonitorPtr mon = (*it).lock(); CAChannelMonitorPtr mon = it->lock();
if (!mon) continue; if (!mon) continue;
mon->stop(); mon->stop();
} }

5
src/ca/caProvider.cpp
View File

@@ -33,10 +33,11 @@ CAChannelProvider::~CAChannelProvider()
{ {
std::queue<CAChannelPtr> channelQ; std::queue<CAChannelPtr> channelQ;
{ {
std::vector<CAChannelWPtr>::iterator it;
epicsGuard<epicsMutex> G(channelListMutex); epicsGuard<epicsMutex> G(channelListMutex);
for (size_t i = 0; i < caChannelList.size(); ++i) for (it = caChannelList.begin(); it != caChannelList.end(); ++it)
{ {
CAChannelPtr caChannel(caChannelList[i].lock()); CAChannelPtr caChannel(it->lock());
if (caChannel) if (caChannel)
channelQ.push(caChannel); channelQ.push(caChannel);
} }