From 090e6ce3d36fb99a8e5a2f07bf14a283b6e2ee51 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Mon, 5 Aug 1996 19:31:59 +0000
Subject: [PATCH] fixed removes use of iter.cur()

---
 src/cxxTemplates/resourceLib.h        | 11 ++++++++---
 src/libCom/cxxTemplates/resourceLib.h | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/cxxTemplates/resourceLib.h b/src/cxxTemplates/resourceLib.h
index 2e860455e..45fbae650 100644
--- a/src/cxxTemplates/resourceLib.h
+++ b/src/cxxTemplates/resourceLib.h
@@ -29,6 +29,9 @@
  *
  * History
  * $Log$
+ * Revision 1.3  1996/07/25 17:58:16  jhill
+ * fixed missing ref in list decl
+ *
  * Revision 1.2  1996/07/24 22:12:02  jhill
  * added remove() to iter class + made node's prev/next private
  *
@@ -164,7 +167,7 @@ public:
 		//
 		// T must derive from ID
 		//
-		tsSLList<T> &list(this->pTable[this->hash(res)]);
+		tsSLList<T> &list = this->pTable[this->hash(res)];
 		tsSLIter<T> iter(list);
 
 		this->find(iter, res);
@@ -179,13 +182,15 @@ public:
 	T *remove (const ID &idIn)
 	{
 		tsSLIter<T> iter(this->pTable[this->hash(idIn)]);
+		T *pCur;
 
 		this->find(iter, idIn);
-		if (iter.current()) {
+		pCur = iter.current();
+		if (pCur) {
 			this->nInUse--;
 			iter.remove();
 		}
-		return iter.current();
+		return pCur;
 	}
 
 
diff --git a/src/libCom/cxxTemplates/resourceLib.h b/src/libCom/cxxTemplates/resourceLib.h
index 2e860455e..45fbae650 100644
--- a/src/libCom/cxxTemplates/resourceLib.h
+++ b/src/libCom/cxxTemplates/resourceLib.h
@@ -29,6 +29,9 @@
  *
  * History
  * $Log$
+ * Revision 1.3  1996/07/25 17:58:16  jhill
+ * fixed missing ref in list decl
+ *
  * Revision 1.2  1996/07/24 22:12:02  jhill
  * added remove() to iter class + made node's prev/next private
  *
@@ -164,7 +167,7 @@ public:
 		//
 		// T must derive from ID
 		//
-		tsSLList<T> &list(this->pTable[this->hash(res)]);
+		tsSLList<T> &list = this->pTable[this->hash(res)];
 		tsSLIter<T> iter(list);
 
 		this->find(iter, res);
@@ -179,13 +182,15 @@ public:
 	T *remove (const ID &idIn)
 	{
 		tsSLIter<T> iter(this->pTable[this->hash(idIn)]);
+		T *pCur;
 
 		this->find(iter, idIn);
-		if (iter.current()) {
+		pCur = iter.current();
+		if (pCur) {
 			this->nInUse--;
 			iter.remove();
 		}
-		return iter.current();
+		return pCur;
 	}