diff --git a/src/cxxTemplates/resourceLib.h b/src/cxxTemplates/resourceLib.h
index 778376578..3ecc23ae0 100644
--- a/src/cxxTemplates/resourceLib.h
+++ b/src/cxxTemplates/resourceLib.h
@@ -29,6 +29,9 @@
  *
  * History
  * $Log$
+ * Revision 1.9  1997/04/23 17:11:15  jhill
+ * stringId::T[] => stringIdFastHash[]
+ *
  * Revision 1.8  1997/04/10 19:43:09  jhill
  * API changes
  *
@@ -66,6 +69,7 @@
 #include <limits.h>
 #include <string.h>
 #include <math.h>
+#include <assert.h>
 
 #include "tsSLList.h"
 #include "shareLib.h"
@@ -322,7 +326,7 @@ public:
 		// CPU architectures)
 		//
 		unsigned long src = (unsigned long) this->id;
-                resTableIndex hashid;
+                unsigned long hashid;
  
                 hashid = src;
                 src = src >> nBitsId;
@@ -334,7 +338,7 @@ public:
                 // the result here is always masked to the
                 // proper size after it is returned to the resource class
                 //
-                return hashid;
+                return (resTableIndex) hashid;
         }
  
         int operator == (const ptrId &idIn)
diff --git a/src/cxxTemplates/tsDLList.h b/src/cxxTemplates/tsDLList.h
index c96857d37..fc892e06a 100644
--- a/src/cxxTemplates/tsDLList.h
+++ b/src/cxxTemplates/tsDLList.h
@@ -31,6 +31,9 @@
  *
  * History
  * $Log$
+ * Revision 1.8  1997/04/11 20:49:48  jhill
+ * added no arg reset() to bwd iter
+ *
  * Revision 1.7  1997/04/10 19:43:10  jhill
  * API changes
  *
@@ -58,6 +61,12 @@
 #ifndef tsDLListH_include
 #define tsDLListH_include
 
+template <class T> class tsDLList;
+template <class T> class tsDLIterBD;
+template <class T> class tsDLIter;
+template <class T> class tsDLFwdIter;
+template <class T> class tsDLBwdIter;
+
 //
 // tsDLNode<T>
 // NOTE: T must derive from tsDLNode<T>
@@ -507,7 +516,7 @@ protected:
 template <class T>
 class tsDLFwdIter: private tsDLIter<T> {
 public:
-	tsDLFwdIter (tsDLList<T> &listIn) : 
+	tsDLFwdIter (const tsDLList<T> &listIn) : 
 		tsDLIter<T>(listIn) {}
 
 	void reset ()
@@ -587,7 +596,7 @@ public:
 template <class T>
 class tsDLBwdIter : private tsDLIter<T> {
 public:
-	tsDLBwdIter(tsDLList<T> &listIn) : 
+	tsDLBwdIter(const tsDLList<T> &listIn) : 
 		tsDLIter<T>(listIn) {}
 
 	void reset ()
diff --git a/src/cxxTemplates/tsSLList.h b/src/cxxTemplates/tsSLList.h
index 60cdc00b5..9c712c0b6 100644
--- a/src/cxxTemplates/tsSLList.h
+++ b/src/cxxTemplates/tsSLList.h
@@ -31,6 +31,9 @@
  *
  * History
  * $Log$
+ * Revision 1.7  1997/04/10 19:43:10  jhill
+ * API changes
+ *
  * Revision 1.6  1997/01/22 21:14:21  jhill
  * fixed class decl order for VMS
  *
@@ -52,6 +55,14 @@
  *
  */
 
+//
+// the hp compiler complains about parameterized friend
+// class that has not been declared without this?
+//
+template <class T> class tsSLList;
+template <class T> class tsSLIter;
+template <class T> class tsSLIterRm;
+
 //
 // tsSLNode<>
 // NOTE: T must derive from tsSLNode<T>
diff --git a/src/libCom/cxxTemplates/resourceLib.h b/src/libCom/cxxTemplates/resourceLib.h
index 778376578..3ecc23ae0 100644
--- a/src/libCom/cxxTemplates/resourceLib.h
+++ b/src/libCom/cxxTemplates/resourceLib.h
@@ -29,6 +29,9 @@
  *
  * History
  * $Log$
+ * Revision 1.9  1997/04/23 17:11:15  jhill
+ * stringId::T[] => stringIdFastHash[]
+ *
  * Revision 1.8  1997/04/10 19:43:09  jhill
  * API changes
  *
@@ -66,6 +69,7 @@
 #include <limits.h>
 #include <string.h>
 #include <math.h>
+#include <assert.h>
 
 #include "tsSLList.h"
 #include "shareLib.h"
@@ -322,7 +326,7 @@ public:
 		// CPU architectures)
 		//
 		unsigned long src = (unsigned long) this->id;
-                resTableIndex hashid;
+                unsigned long hashid;
  
                 hashid = src;
                 src = src >> nBitsId;
@@ -334,7 +338,7 @@ public:
                 // the result here is always masked to the
                 // proper size after it is returned to the resource class
                 //
-                return hashid;
+                return (resTableIndex) hashid;
         }
  
         int operator == (const ptrId &idIn)
diff --git a/src/libCom/cxxTemplates/tsDLList.h b/src/libCom/cxxTemplates/tsDLList.h
index c96857d37..fc892e06a 100644
--- a/src/libCom/cxxTemplates/tsDLList.h
+++ b/src/libCom/cxxTemplates/tsDLList.h
@@ -31,6 +31,9 @@
  *
  * History
  * $Log$
+ * Revision 1.8  1997/04/11 20:49:48  jhill
+ * added no arg reset() to bwd iter
+ *
  * Revision 1.7  1997/04/10 19:43:10  jhill
  * API changes
  *
@@ -58,6 +61,12 @@
 #ifndef tsDLListH_include
 #define tsDLListH_include
 
+template <class T> class tsDLList;
+template <class T> class tsDLIterBD;
+template <class T> class tsDLIter;
+template <class T> class tsDLFwdIter;
+template <class T> class tsDLBwdIter;
+
 //
 // tsDLNode<T>
 // NOTE: T must derive from tsDLNode<T>
@@ -507,7 +516,7 @@ protected:
 template <class T>
 class tsDLFwdIter: private tsDLIter<T> {
 public:
-	tsDLFwdIter (tsDLList<T> &listIn) : 
+	tsDLFwdIter (const tsDLList<T> &listIn) : 
 		tsDLIter<T>(listIn) {}
 
 	void reset ()
@@ -587,7 +596,7 @@ public:
 template <class T>
 class tsDLBwdIter : private tsDLIter<T> {
 public:
-	tsDLBwdIter(tsDLList<T> &listIn) : 
+	tsDLBwdIter(const tsDLList<T> &listIn) : 
 		tsDLIter<T>(listIn) {}
 
 	void reset ()
diff --git a/src/libCom/cxxTemplates/tsSLList.h b/src/libCom/cxxTemplates/tsSLList.h
index 60cdc00b5..9c712c0b6 100644
--- a/src/libCom/cxxTemplates/tsSLList.h
+++ b/src/libCom/cxxTemplates/tsSLList.h
@@ -31,6 +31,9 @@
  *
  * History
  * $Log$
+ * Revision 1.7  1997/04/10 19:43:10  jhill
+ * API changes
+ *
  * Revision 1.6  1997/01/22 21:14:21  jhill
  * fixed class decl order for VMS
  *
@@ -52,6 +55,14 @@
  *
  */
 
+//
+// the hp compiler complains about parameterized friend
+// class that has not been declared without this?
+//
+template <class T> class tsSLList;
+template <class T> class tsSLIter;
+template <class T> class tsSLIterRm;
+
 //
 // tsSLNode<>
 // NOTE: T must derive from tsSLNode<T>