From 4fd24a13380146d28b32d58520f9df33bd06a416 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Sat, 7 Aug 1999 00:55:35 +0000
Subject: [PATCH] solaris compiler issues

---
 src/cas/generic/caServer.cc     |  5 ++++-
 src/cas/generic/casEventMask.cc | 15 +++++++++------
 src/cas/generic/server.h        |  6 +++---
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/cas/generic/caServer.cc b/src/cas/generic/caServer.cc
index e8bc32184..aa7d69e4b 100644
--- a/src/cas/generic/caServer.cc
+++ b/src/cas/generic/caServer.cc
@@ -31,6 +31,9 @@
 =======
  * History
  * $Log$
+ * Revision 1.11  1999/08/04 23:05:29  jhill
+ * applied chronIntId name change
+ *
  * Revision 1.10  1999/01/28 20:18:14  jhill
  * removed implicit int
  *
@@ -83,7 +86,7 @@
 	// This explicitly instantiates the template class's member
 	// functions into "templInst.o"
 	//
-	template class resTable <casEventMaskEntry, stringId>;
+	template class resTable <casEventMaskEntry, stringIdentifier <16,8> >;
 	template class resTable <casRes, chronIntId>;
 #endif
 
diff --git a/src/cas/generic/casEventMask.cc b/src/cas/generic/casEventMask.cc
index bc8760676..5001bf95b 100644
--- a/src/cas/generic/casEventMask.cc
+++ b/src/cas/generic/casEventMask.cc
@@ -29,6 +29,9 @@
  *
  * History
  * $Log$
+ * Revision 1.11  1999/08/04 23:53:20  jhill
+ * elimated init flag and init routine
+ *
  * Revision 1.10  1998/12/01 23:32:15  jhill
  * removed inline frm evt msk alloc
  *
@@ -134,9 +137,9 @@ casEventMask casEventRegistry::registerEvent(const char *pName)
 	// NOTE: pName outlives id here
 	// (so the refString option is ok)
 	//
-	stringId 		id (pName, stringId::refString);
-	casEventMaskEntry	*pEntry;
-	casEventMask		mask;
+	stringIdentifier <16,8> id (pName, stringId::refString);
+	casEventMaskEntry       *pEntry;
+	casEventMask            mask;
 
 	this->mutex.osiLock();
 	pEntry = this->lookup (id);
@@ -189,7 +192,7 @@ void casEventRegistry::show(unsigned level) const
 		printf ("casEventRegistry: bit allocator = %d\n", 
 				this->allocator);
 	}
-	this->resTable <casEventMaskEntry, stringId>::show(level);
+	this->resTable <casEventMaskEntry, stringIdentifier <16,8> >::show(level);
 	this->mutex.osiUnlock();
 }
 
@@ -198,7 +201,7 @@ void casEventRegistry::show(unsigned level) const
 //
 casEventMaskEntry::casEventMaskEntry(
 	casEventRegistry &regIn, casEventMask maskIn, const char *pName) :
-	casEventMask (maskIn), stringId (pName), reg (regIn)
+	casEventMask (maskIn), stringIdentifier <16,8> (pName), reg (regIn)
 {
 	int 	stat;
 
@@ -234,6 +237,6 @@ void casEventMaskEntry::destroy()
 void casEventMaskEntry::show (unsigned level) const 
 {
 	this->casEventMask::show(level);
-	this->stringId::show(level);
+	this->stringIdentifier <16,8>::show(level);
 }
 
diff --git a/src/cas/generic/server.h b/src/cas/generic/server.h
index 05b341af0..ce0fea5a5 100644
--- a/src/cas/generic/server.h
+++ b/src/cas/generic/server.h
@@ -755,7 +755,7 @@ private:
 // casEventMaskEntry
 //
 class casEventMaskEntry : public tsSLNode<casEventMaskEntry>,
-	public casEventMask, public stringId {
+	public casEventMask, public stringIdentifier <16,8> {
 public:
 	casEventMaskEntry (casEventRegistry &regIn,
 	    casEventMask maskIn, const char *pName);
@@ -772,12 +772,12 @@ static const unsigned casEventRegistryHashTableSize = 256u;
 //
 // casEventRegistry
 //
-class casEventRegistry : private resTable <casEventMaskEntry, stringId> {
+class casEventRegistry : private resTable <casEventMaskEntry, stringIdentifier <16,8> > {
     friend class casEventMaskEntry;
 public:
     
     casEventRegistry (osiMutex &mutexIn) : mutex(mutexIn), allocator(0), 
-        resTable<casEventMaskEntry, stringId> (casEventRegistryHashTableSize) {}
+        resTable<casEventMaskEntry, stringIdentifier <16,8> > (casEventRegistryHashTableSize) {}
     
     virtual ~casEventRegistry();