From 99432d68091f72d8a4d48011de03f05d426aafe7 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@anl.gov>
Date: Fri, 1 Oct 2021 09:54:48 -0500
Subject: [PATCH] caProvider: Minor cleanup

---
 src/ca/caChannel.cpp  | 2 +-
 src/ca/caProvider.cpp | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/ca/caChannel.cpp b/src/ca/caChannel.cpp
index f3f67e0..ed02812 100644
--- a/src/ca/caChannel.cpp
+++ b/src/ca/caChannel.cpp
@@ -159,7 +159,7 @@ void CAChannel::disconnectChannel()
     }
     std::vector<CAChannelMonitorWPtr>::iterator it;
     for (it = monitorlist.begin(); it!=monitorlist.end(); ++it) {
-        CAChannelMonitorPtr mon = (*it).lock();
+        CAChannelMonitorPtr mon = it->lock();
         if (!mon) continue;
         mon->stop();
     }
diff --git a/src/ca/caProvider.cpp b/src/ca/caProvider.cpp
index 731469d..8cc15b3 100644
--- a/src/ca/caProvider.cpp
+++ b/src/ca/caProvider.cpp
@@ -33,10 +33,11 @@ CAChannelProvider::~CAChannelProvider()
 {
     std::queue<CAChannelPtr> channelQ;
     {
+        std::vector<CAChannelWPtr>::iterator it;
         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)
                 channelQ.push(caChannel);
         }