epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

solaris compiler issues

Browse Source
This commit is contained in:
Jeff Hill
1999-08-07 00:55:35 +00:00
parent 49a6b46eba
commit 4fd24a1338
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/cas/generic/caServer.cc
View File

@@ -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

15
src/cas/generic/casEventMask.cc
View File

@@ -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);
}

6
src/cas/generic/server.h
View File

@@ -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();