From 5ad2970bd114d89bc7e396c7573b5151f767c884 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Wed, 9 Feb 2000 20:11:05 +0000
Subject: [PATCH] update

---
 src/cxxTemplates/test/resourceLibTest.cc        | 10 ++++++----
 src/libCom/cxxTemplates/test/resourceLibTest.cc | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/cxxTemplates/test/resourceLibTest.cc b/src/cxxTemplates/test/resourceLibTest.cc
index cddf4b655..e6655b420 100644
--- a/src/cxxTemplates/test/resourceLibTest.cc
+++ b/src/cxxTemplates/test/resourceLibTest.cc
@@ -14,7 +14,10 @@ void empty();
 class albert : public intId<unsigned,8>, public tsSLNode<albert> {
 public:
 	albert (resTable< albert, intId<unsigned,8> > &atIn, unsigned idIn) : 
-		intId<unsigned,8>(idIn), at(atIn) {}
+		intId<unsigned,8>(idIn), at(atIn) 
+    {
+        assert (at.add (*this)==0);
+    }
 	void show (unsigned /* level */) 
 	{
 	}
@@ -235,16 +238,15 @@ int main()
 	resTable< albert, intId<unsigned,8> > alTbl (tableSize);	
 
 	for (i=0; i<tableSize*8; i++) {
-		albert *pa = new albert(alTbl, i);
+		albert *pa = new albert (alTbl, i);
 		assert (pa);
-		assert (alTbl.add (*pa)==0);
 	}
 	alTbl.show(1u);
 
     resTableIter< albert, intId<unsigned,8> > alTblIter (alTbl);
     albert *pa;
     i=0;
-    while (pa = alTblIter.next()) {
+    while ( (pa = alTblIter.next()) ) {
         i++;
     }
     assert (i==tableSize*8);
diff --git a/src/libCom/cxxTemplates/test/resourceLibTest.cc b/src/libCom/cxxTemplates/test/resourceLibTest.cc
index cddf4b655..e6655b420 100644
--- a/src/libCom/cxxTemplates/test/resourceLibTest.cc
+++ b/src/libCom/cxxTemplates/test/resourceLibTest.cc
@@ -14,7 +14,10 @@ void empty();
 class albert : public intId<unsigned,8>, public tsSLNode<albert> {
 public:
 	albert (resTable< albert, intId<unsigned,8> > &atIn, unsigned idIn) : 
-		intId<unsigned,8>(idIn), at(atIn) {}
+		intId<unsigned,8>(idIn), at(atIn) 
+    {
+        assert (at.add (*this)==0);
+    }
 	void show (unsigned /* level */) 
 	{
 	}
@@ -235,16 +238,15 @@ int main()
 	resTable< albert, intId<unsigned,8> > alTbl (tableSize);	
 
 	for (i=0; i<tableSize*8; i++) {
-		albert *pa = new albert(alTbl, i);
+		albert *pa = new albert (alTbl, i);
 		assert (pa);
-		assert (alTbl.add (*pa)==0);
 	}
 	alTbl.show(1u);
 
     resTableIter< albert, intId<unsigned,8> > alTblIter (alTbl);
     albert *pa;
     i=0;
-    while (pa = alTblIter.next()) {
+    while ( (pa = alTblIter.next()) ) {
         i++;
     }
     assert (i==tableSize*8);