From 563733cf3c835ba84c18e117deb0262913d30408 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Wed, 28 Apr 2004 22:11:25 +0000
Subject: [PATCH] changed to call new idAssignAdd func

---
 src/ca/ca_client_context.cpp     | 2 +-
 src/ca/cac.cpp                   | 9 +++++----
 src/cas/generic/casStrmClient.cc | 2 +-
 src/libCom/fdmgr/fdmgr.cpp       | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/ca/ca_client_context.cpp b/src/ca/ca_client_context.cpp
index 674377b7d..a140b769e 100644
--- a/src/ca/ca_client_context.cpp
+++ b/src/ca/ca_client_context.cpp
@@ -689,7 +689,7 @@ void ca_client_context::installCASG (
     epicsGuard < epicsMutex > & guard, CASG & sg )
 {
     guard.assertIdenticalMutex ( this->mutex );
-    this->sgTable.add ( sg );
+    this->sgTable.idAssignAdd ( sg );
 }
 
 void ca_client_context::uninstallCASG ( 
diff --git a/src/ca/cac.cpp b/src/ca/cac.cpp
index 4ea4a2de6..aa7b926ef 100644
--- a/src/ca/cac.cpp
+++ b/src/ca/cac.cpp
@@ -460,7 +460,7 @@ cacChannel & cac::createChannel (
 
     nciu * pNetChan = new ( this->channelFreeList ) 
             nciu ( *this, *this->pudpiiu, chan, pName, pri );
-    this->chanTable.add ( *pNetChan );
+    this->chanTable.idAssignAdd ( *pNetChan );
     return *pNetChan;
 }
 
@@ -627,7 +627,7 @@ netWriteNotifyIO & cac::writeNotifyRequest (
     autoPtrRecycle  < netWriteNotifyIO > pIO ( 
         guard, this->ioTable, *this, 
         netWriteNotifyIO::factory ( this->freeListWriteNotifyIO, icni, notifyIn ) );
-    this->ioTable.add ( *pIO );
+    this->ioTable.idAssignAdd ( *pIO );
     chan.getPIIU(guard)->writeNotifyRequest ( 
         guard, chan, *pIO, type, nElem, pValue );
     return *pIO.release();
@@ -641,7 +641,7 @@ netReadNotifyIO & cac::readNotifyRequest (
     autoPtrRecycle  < netReadNotifyIO > pIO ( 
         guard, this->ioTable, *this,
         netReadNotifyIO::factory ( this->freeListReadNotifyIO, icni, notifyIn ) );
-    this->ioTable.add ( *pIO );
+    this->ioTable.idAssignAdd ( *pIO );
     chan.getPIIU(guard)->readNotifyRequest ( guard, chan, *pIO, type, nElem );
     return *pIO.release();
 }
@@ -735,7 +735,7 @@ netSubscription & cac::subscriptionRequest (
         guard, this->ioTable, *this, 
         netSubscription::factory ( this->freeListSubscription,
                                    privChan, type, nElem, mask, notifyIn ) );
-    this->ioTable.add ( *pIO );
+    this->ioTable.idAssignAdd ( *pIO );
     if ( chanIsInstalled ) {
         pIO->subscribeIfRequired ( guard, chan );
     }
@@ -817,6 +817,7 @@ bool cac::readNotifyRespAction ( callbackManager &, tcpiiu & iiu,
         // then we need to reinstall the IO into the table
         netSubscription * pSubscr = pmiu->isSubscription ();
         if ( pSubscr ) {
+            // this does *not* assign a new resource id
             this->ioTable.add ( *pmiu );
         }
         if ( caStatus == ECA_NORMAL ) {
diff --git a/src/cas/generic/casStrmClient.cc b/src/cas/generic/casStrmClient.cc
index 8380a4c4b..fe08e87c1 100644
--- a/src/cas/generic/casStrmClient.cc
+++ b/src/cas/generic/casStrmClient.cc
@@ -1340,7 +1340,7 @@ caStatus casStrmClient::createChanResponse (
     // while an asynchronous IO fetching the enum
     // string table is outstanding
     //
-    this->chanTable.add ( *pChan->pChanI );
+    this->chanTable.idAssignAdd ( *pChan->pChanI );
     this->chanList.add ( *pChan->pChanI );
     pChan->pChanI->installIntoPV ();
 
diff --git a/src/libCom/fdmgr/fdmgr.cpp b/src/libCom/fdmgr/fdmgr.cpp
index eaed2ee02..56870b8d7 100644
--- a/src/libCom/fdmgr/fdmgr.cpp
+++ b/src/libCom/fdmgr/fdmgr.cpp
@@ -137,7 +137,7 @@ timerForOldFdmgr::timerForOldFdmgr ( oldFdmgr &fdmgrIn,
     if ( pFuncIn == NULL ) {
         throwWithLocation ( noFunctionSpecified () );
     }
-    this->fdmgr.resTbl.add (*this);
+    this->fdmgr.resTbl.idAssignAdd (*this);
     this->timer.start ( *this, delayIn );
 }