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

fixed compiler compatibility problems

Browse Source
This commit is contained in:
Jeff Hill
1997-06-13 09:21:53 +00:00
parent 830d2ff061
commit 2b67d03514
6 changed files with 56 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cxxTemplates/resourceLib.h
View File

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

13
src/cxxTemplates/tsDLList.h
View File

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

11
src/cxxTemplates/tsSLList.h
View File

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

8
src/libCom/cxxTemplates/resourceLib.h
View File

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

13
src/libCom/cxxTemplates/tsDLList.h
View File

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

11
src/libCom/cxxTemplates/tsSLList.h
View File

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