From 3a893a3f72d09d4d5693fc44e0f7494b03a0c3b0 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Wed, 4 Aug 1999 23:21:14 +0000
Subject: [PATCH] updated to new DLL terminators

---
 src/cas/generic/casChannelI.cc   | 27 +++++++++----------
 src/cas/generic/casChannelIIL.h  | 11 ++++----
 src/cas/generic/casCoreClient.cc | 45 ++------------------------------
 3 files changed, 20 insertions(+), 63 deletions(-)

diff --git a/src/cas/generic/casChannelI.cc b/src/cas/generic/casChannelI.cc
index 06aa10624..94c5a9bf3 100644
--- a/src/cas/generic/casChannelI.cc
+++ b/src/cas/generic/casChannelI.cc
@@ -29,6 +29,9 @@
  *
  * History
  * $Log$
+ * Revision 1.7  1998/09/24 20:33:03  jhill
+ * cosmetic
+ *
  * Revision 1.6  1998/07/08 15:38:03  jhill
  * fixed lost monitors during flow control problem
  *
@@ -90,13 +93,11 @@ casChannelI::~casChannelI()
 	// cancel any pending asynchronous IO 
 	//
 	tsDLIterBD<casAsyncIOI> iterAIO(this->ioInProgList.first());
-	const tsDLIterBD<casAsyncIOI> eolAIO;
-	tsDLIterBD<casAsyncIOI> tmpAIO;
-	while ( iterAIO!=eolAIO ) {
+	while ( iterAIO!=tsDLIterBD<casAsyncIOI>::eol() ) {
 		//
 		// destructor removes from this list
 		//
-		tmpAIO = iterAIO;
+		tsDLIterBD<casAsyncIOI> tmpAIO = iterAIO;
 		++tmpAIO;
 		iterAIO->destroy();
 		iterAIO = tmpAIO;
@@ -106,14 +107,13 @@ casChannelI::~casChannelI()
 	// cancel the monitors 
 	//
 	tsDLIterBD<casMonitor> iterMon(this->monitorList.first());
-	const tsDLIterBD<casMonitor> eolMon;
-	tsDLIterBD<casMonitor> tmpMon;
-	while ( iterMon!=eolMon ) {
+	while ( iterMon!=tsDLIterBD<casMonitor>::eol() ) {
 		casMonitor *pMonitor;
 		//
 		// destructor removes from this list
 		//
-		pMonitor = tmpMon = iterMon;
+        tsDLIterBD<casMonitor> tmpMon = iterMon;
+		pMonitor = tmpMon;
 		++tmpMon;
 		delete pMonitor;
 		iterMon = tmpMon;
@@ -171,13 +171,11 @@ void casChannelI::clearOutstandingReads()
     // cancel any pending asynchronous IO 
     //
 	tsDLIterBD<casAsyncIOI> iterIO(this->ioInProgList.first());
-	tsDLIterBD<casAsyncIOI> eolIO;
-	tsDLIterBD<casAsyncIOI> tmp;
-	while (iterIO!=eolIO) {
+	while (iterIO!=tsDLIterBD<casAsyncIOI>::eol() ) {
 		//
 		// destructor removes from this list
 		//
-		tmp = iterIO;
+		tsDLIterBD<casAsyncIOI> tmp = iterIO;
 		++tmp;
 		iterIO->destroyIfReadOP();
 		iterIO = tmp;
@@ -195,12 +193,11 @@ void casChannelI::show(unsigned level) const
 	this->lock();
 
 	tsDLIterBD<casMonitor> iter(this->monitorList.first());
-	tsDLIterBD<casMonitor> eol;
-	if ( iter!=eol ) {
+	if ( iter!=tsDLIterBD<casMonitor>::eol() ) {
 		printf("List of CA events (monitors) for \"%s\".\n",
 			this->pv->getName());
 	}
-	while ( iter!=eol ) {
+	while ( iter!=tsDLIterBD<casMonitor>::eol() ) {
 		iter->show(level);
 		++iter;
 	}
diff --git a/src/cas/generic/casChannelIIL.h b/src/cas/generic/casChannelIIL.h
index bde107958..cf9f04a5a 100644
--- a/src/cas/generic/casChannelIIL.h
+++ b/src/cas/generic/casChannelIIL.h
@@ -29,6 +29,9 @@
  *
  * History
  * $Log$
+ * Revision 1.6  1997/04/10 19:34:00  jhill
+ * API changes
+ *
  * Revision 1.5  1996/11/02 00:54:03  jhill
  * many improvements
  *
@@ -85,8 +88,7 @@ inline void casChannelI::postEvent(const casEventMask &select, gdd &event)
 {
 	this->lock();
         tsDLIterBD<casMonitor> iter(this->monitorList.first());
-        const tsDLIterBD<casMonitor> eol;
-        while ( iter!=eol ) {
+        while ( iter!=tsDLIterBD<casMonitor>::eol() ) {
                 iter->post(select, event);
 		++iter;
         }
@@ -130,8 +132,7 @@ inline casMonitor *casChannelI::findMonitor(const caResId clientIdIn)
 {
 	this->lock();
 	tsDLIterBD<casMonitor> iter(this->monitorList.first());
-	tsDLIterBD<casMonitor> eol;
-	while ( iter!=eol ) {
+    while ( iter!=tsDLIterBD<casMonitor>::eol() ) {
 		if ( clientIdIn == iter->getClientId()) {
 			casMonitor *pMon = iter;
 			return pMon;
@@ -184,7 +185,7 @@ inline void casChannelI::removeAsyncIO(casAsyncIOI &io)
 //
 inline const caResId casChannelI::getSID()
 {
-	return this->uintId::getId();
+    return this->casRes::getId();
 }
 
 //
diff --git a/src/cas/generic/casCoreClient.cc b/src/cas/generic/casCoreClient.cc
index c08da7157..b72d86e08 100644
--- a/src/cas/generic/casCoreClient.cc
+++ b/src/cas/generic/casCoreClient.cc
@@ -26,45 +26,6 @@
  *              Advanced Photon Source
  *              Argonne National Laboratory
  *
- *
- * History
- * $Log$
- * Revision 1.11  1998/12/19 00:04:50  jhill
- * renamed createPV() to pvAttach()
- *
- * Revision 1.10  1998/10/28 23:51:00  jhill
- * server nolonger throws exception when a poorly formed get/put call back
- * request arrives. Instead a get/put call back response is sent which includes
- * unsuccessful status
- *
- * Revision 1.9  1998/07/08 15:38:04  jhill
- * fixed lost monitors during flow control problem
- *
- * Revision 1.8  1998/06/16 02:25:05  jhill
- * cosmetic
- *
- * Revision 1.7  1998/02/05 22:52:46  jhill
- * removed trash
- *
- * Revision 1.6  1997/06/13 09:15:55  jhill
- * connect proto changes
- *
- * Revision 1.5  1997/04/10 19:34:03  jhill
- * API changes
- *
- * Revision 1.4  1996/11/02 00:54:07  jhill
- * many improvements
- *
- * Revision 1.3  1996/09/16 18:23:59  jhill
- * vxWorks port changes
- *
- * Revision 1.2  1996/08/13 22:53:14  jhill
- * changes for MVC++
- *
- * Revision 1.1.1.1  1996/06/20 00:28:16  jhill
- * ca server installation
- *
- *
  */
 
 
@@ -108,17 +69,15 @@ casCoreClient::~casCoreClient()
 
 	this->osiLock();
 	tsDLIterBD<casAsyncIOI>   iterIO(this->ioInProgList.first());
-	tsDLIterBD<casAsyncIOI>   tmpIO;
-	tsDLIterBD<casAsyncIOI>   eolIO;
 
 	//
 	// cancel any pending asynchronous IO
 	//
-	while (iterIO!=eolIO) {
+	while (iterIO!=tsDLIterBD<casAsyncIOI>::eol()) {
 		//
 		// destructor removes from this list
 		//
-		tmpIO = iterIO;
+		tsDLIterBD<casAsyncIOI> tmpIO = iterIO;
 		++tmpIO;
 		iterIO->destroy();
 		iterIO = tmpIO;