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

rearranged to allow compilation by g++ 2.8.1

Browse Source
This commit is contained in:
Jeff Hill
1998-05-05 18:06:58 +00:00
parent 0fd0552bb7
commit 5dfa5ca37d
4 changed files with 156 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
src/cxxTemplates/tsDLList.h
View File

@@ -31,6 +31,9 @@
*
* History
* $Log$
* Revision 1.10 1998/02/05 23:28:21 jhill
* fixed hp sompiler warnings
*
* Revision 1.9 1997/06/13 09:21:52 jhill
* fixed compiler compatibility problems
*
@@ -157,11 +160,14 @@ public:
*this = addList;
}
else {
tsDLNode<T> *pLastNode = this->pLast;
tsDLNode<T> *pAddListFirstNode = addList.pFirst;
//
// add addList to the end of this
//
this->pLast->tsDLNode<T>::pNext = addList.pFirst;
addList.pFirst->tsDLNode<T>::pPrev = addList.pLast;
pLastNode->pNext = addList.pFirst;
pAddListFirstNode->pPrev = addList.pLast;
this->pLast = addList.pLast;
this->itemCount += addList.itemCount;
}
@@ -178,11 +184,14 @@ public:
//
void add (T &item)
{
item.tsDLNode<T>::pNext = 0;
item.tsDLNode<T>::pPrev = this->pLast;
tsDLNode<T> &node = item;
node.pNext = 0;
node.pPrev = this->pLast;
if (this->itemCount) {
this->pLast->tsDLNode<T>::pNext = &item;
tsDLNode<T> *pLastNode = this->pLast;
pLastNode->pNext = &item;
}
else {
this->pFirst = &item;
@@ -213,12 +222,16 @@ public:
//
void insertAfter (T &item, T &itemBefore)
{
item.tsDLNode<T>::pPrev = &itemBefore;
item.tsDLNode<T>::pNext = itemBefore.tsDLNode<T>::pNext;
itemBefore.tsDLNode<T>::pNext = &item;
tsDLNode<T> &node = item;
tsDLNode<T> &nodeBefore = itemBefore;
if (item.tsDLNode<T>::pNext) {
item.tsDLNode<T>::pNext->tsDLNode<T>::pPrev = &item;
node.pPrev = &itemBefore;
node.pNext = nodeBefore.pNext;
nodeBefore.pNext = &item;
if (node.pNext) {
tsDLNode<T> *pNextNode = node.pNext;
pNextNode->pPrev = &item;
}
else {
this->pLast = &item;
@@ -233,12 +246,16 @@ public:
//
void insertBefore (T &item, T &itemAfter)
{
item.tsDLNode<T>::pNext = &itemAfter;
item.tsDLNode<T>::pPrev = itemAfter.tsDLNode<T>::pPrev;
itemAfter.tsDLNode<T>::pPrev = &item;
tsDLNode<T> &node = item;
tsDLNode<T> &nodeAfter = itemAfter;
if (item.tsDLNode<T>::pPrev) {
item.tsDLNode<T>::pPrev->tsDLNode<T>::pNext = &item;
node.pNext = &itemAfter;
node.pPrev = nodeAfter.pPrev;
nodeAfter.pPrev = &item;
if (node.pPrev) {
tsDLNode<T> *pPrevNode = node.pPrev;
pPrevNode->pNext = &item;
}
else {
this->pFirst = &item;
@@ -252,20 +269,22 @@ public:
//
void remove (T &item)
{
tsDLNode<T> &node = item;
if (this->pLast == &item) {
this->pLast = item.tsDLNode<T>::pPrev;
this->pLast = node.pPrev;
}
else {
item.tsDLNode<T>::pNext->tsDLNode<T>::pPrev =
item.tsDLNode<T>::pPrev;
tsDLNode<T> *pNextNode = node.pNext;
pNextNode->pPrev = node.pPrev;
}
if (this->pFirst == &item) {
this->pFirst = item.tsDLNode<T>::pNext;
this->pFirst = node.pNext;
}
else {
item.tsDLNode<T>::pPrev->tsDLNode<T>::pNext =
item.tsDLNode<T>::pNext;
tsDLNode<T> *pPrevNode = node.pPrev;
pPrevNode->pNext = node.pNext;
}
this->itemCount--;
@@ -285,11 +304,13 @@ public:
//
void push (T &item)
{
item.tsDLNode<T>::pPrev = 0;
item.tsDLNode<T>::pNext = this->pFirst;
tsDLNode<T> &node = item;
node.pPrev = 0;
node.pNext = this->pFirst;
if (this->itemCount) {
this->pFirst->tsDLNode<T>::pPrev = &item;
tsDLNode<T> *pFirstNode = this->pFirst;
pFirstNode->pPrev = &item;
}
else {
this->pLast = &item;
@@ -393,7 +414,8 @@ public:
//
T *operator ++ ()
{
return this->pEntry = this->pEntry->tsDLNode<T>::pNext;
tsDLNode<T> *pNode = this->pEntry;
return this->pEntry = pNode->pNext;
}
//
@@ -402,7 +424,8 @@ public:
T *operator ++ (int)
{
T *pE = this->pEntry;
this->pEntry = this->pEntry->tsDLNode<T>::pNext;
tsDLNode<T> *pNode = this->pEntry;
this->pEntry = pNode->pNext;
return pE;
}
@@ -411,7 +434,8 @@ public:
//
T *operator -- ()
{
return this->pEntry = pEntry->tsDLNode<T>::pPrev;
tsDLNode<T> *pEntryNode = pEntry;
return this->pEntry = pEntryNode->pPrev;
}
//
@@ -420,7 +444,8 @@ public:
T *operator -- (int)
{
T *pE = this->pEntry;
this->pEntry = pEntry->tsDLNode<T>::pPrev;
tsDLNode<T> *pEntryNode = pEntry;
this->pEntry = pEntryNode->pPrev;
return pE;
}
private:
@@ -467,7 +492,8 @@ public:
pCur = this->pList->pFirst;
}
else {
pCur = pCur->tsDLNode<T>::pNext;
tsDLNode<T> *pCurNode = pCur;
pCur = pCurNode->pNext;
}
this->pCurrent = pCur;
return pCur;
@@ -480,7 +506,8 @@ public:
pCur = this->pList->pLast;
}
else {
pCur = pCur->tsDLNode<T>::pPrev;
tsDLNode<T> *pCurNode = pCur;
pCur = pCurNode->pPrev;
}
this->pCurrent = pCur;
return pCur;
@@ -547,11 +574,13 @@ public:
}
T * next ()
{
return this->tsDLIter<T>::next();
tsDLIter<T> &iterBase = *this;
return iterBase.next();
}
T * first()
{
return this->tsDLIter<T>::first();
tsDLIter<T> &iterBase = *this;
return iterBase.first();
}
//
@@ -568,6 +597,8 @@ public:
T *pCur = this->pCurrent;
if (pCur) {
tsDLNode<T> *pCurNode = pCur;
//
// strip const (we didnt declare the
// list const in the constructor)
@@ -578,7 +609,7 @@ public:
//
// Move this->pCurrent to the previous item
//
this->pCurrent = pCur->tsDLNode<T>::pPrev;
this->pCurrent = pCurNode->pPrev;
//
// delete current item
@@ -649,6 +680,8 @@ public:
T *pCur = this->pCurrent;
if (pCur) {
tsDLNode<T> *pCurNode = pCur;
//
// strip const (we didnt declare the
// list const in the constructor)
@@ -660,7 +693,7 @@ public:
// Move this->pCurrent to the item after the
// item being deleted
//
this->pCurrent = pCur->tsDLNode<T>::pNext;
this->pCurrent = pCurNode->pNext;
//
// delete current item

15
src/cxxTemplates/tsSLList.h
View File

@@ -31,6 +31,9 @@
*
* History
* $Log$
* Revision 1.10 1998/02/18 22:53:13 jhill
* fixed gnu warning
*
* Revision 1.9 1998/02/05 23:28:21 jhill
* fixed hp sompiler warnings
*
@@ -107,7 +110,8 @@ public:
//
void insert (T &item, tsSLNode<T> &itemBefore)
{
item.tsSLNode<T>::pNext = itemBefore.pNext;
tsSLNode<T> &node = item;
node.pNext = itemBefore.pNext;
itemBefore.pNext = &item;
}
@@ -127,9 +131,11 @@ public:
//
void remove (tsSLNode<T> &itemBefore)
{
T *pItem = itemBefore.tsSLNode<T>::pNext;
tsSLNode<T> &nodeBefore = itemBefore;
T *pItem = nodeBefore.pNext;
if (pItem) {
itemBefore.tsSLNode<T>::pNext = pItem->tsSLNode<T>::pNext;
tsSLNode<T> *pNode = pItem;
nodeBefore.pNext = pNode->pNext;
}
}
@@ -138,7 +144,8 @@ public:
//
T * get()
{
T *pItem = this->tsSLNode<T>::pNext;
tsSLNode<T> *pThisNode = this;
T *pItem = pThisNode->pNext;
this->remove(*this);
return pItem;
}

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

@@ -31,6 +31,9 @@
*
* History
* $Log$
* Revision 1.10 1998/02/05 23:28:21 jhill
* fixed hp sompiler warnings
*
* Revision 1.9 1997/06/13 09:21:52 jhill
* fixed compiler compatibility problems
*
@@ -157,11 +160,14 @@ public:
*this = addList;
}
else {
tsDLNode<T> *pLastNode = this->pLast;
tsDLNode<T> *pAddListFirstNode = addList.pFirst;
//
// add addList to the end of this
//
this->pLast->tsDLNode<T>::pNext = addList.pFirst;
addList.pFirst->tsDLNode<T>::pPrev = addList.pLast;
pLastNode->pNext = addList.pFirst;
pAddListFirstNode->pPrev = addList.pLast;
this->pLast = addList.pLast;
this->itemCount += addList.itemCount;
}
@@ -178,11 +184,14 @@ public:
//
void add (T &item)
{
item.tsDLNode<T>::pNext = 0;
item.tsDLNode<T>::pPrev = this->pLast;
tsDLNode<T> &node = item;
node.pNext = 0;
node.pPrev = this->pLast;
if (this->itemCount) {
this->pLast->tsDLNode<T>::pNext = &item;
tsDLNode<T> *pLastNode = this->pLast;
pLastNode->pNext = &item;
}
else {
this->pFirst = &item;
@@ -213,12 +222,16 @@ public:
//
void insertAfter (T &item, T &itemBefore)
{
item.tsDLNode<T>::pPrev = &itemBefore;
item.tsDLNode<T>::pNext = itemBefore.tsDLNode<T>::pNext;
itemBefore.tsDLNode<T>::pNext = &item;
tsDLNode<T> &node = item;
tsDLNode<T> &nodeBefore = itemBefore;
if (item.tsDLNode<T>::pNext) {
item.tsDLNode<T>::pNext->tsDLNode<T>::pPrev = &item;
node.pPrev = &itemBefore;
node.pNext = nodeBefore.pNext;
nodeBefore.pNext = &item;
if (node.pNext) {
tsDLNode<T> *pNextNode = node.pNext;
pNextNode->pPrev = &item;
}
else {
this->pLast = &item;
@@ -233,12 +246,16 @@ public:
//
void insertBefore (T &item, T &itemAfter)
{
item.tsDLNode<T>::pNext = &itemAfter;
item.tsDLNode<T>::pPrev = itemAfter.tsDLNode<T>::pPrev;
itemAfter.tsDLNode<T>::pPrev = &item;
tsDLNode<T> &node = item;
tsDLNode<T> &nodeAfter = itemAfter;
if (item.tsDLNode<T>::pPrev) {
item.tsDLNode<T>::pPrev->tsDLNode<T>::pNext = &item;
node.pNext = &itemAfter;
node.pPrev = nodeAfter.pPrev;
nodeAfter.pPrev = &item;
if (node.pPrev) {
tsDLNode<T> *pPrevNode = node.pPrev;
pPrevNode->pNext = &item;
}
else {
this->pFirst = &item;
@@ -252,20 +269,22 @@ public:
//
void remove (T &item)
{
tsDLNode<T> &node = item;
if (this->pLast == &item) {
this->pLast = item.tsDLNode<T>::pPrev;
this->pLast = node.pPrev;
}
else {
item.tsDLNode<T>::pNext->tsDLNode<T>::pPrev =
item.tsDLNode<T>::pPrev;
tsDLNode<T> *pNextNode = node.pNext;
pNextNode->pPrev = node.pPrev;
}
if (this->pFirst == &item) {
this->pFirst = item.tsDLNode<T>::pNext;
this->pFirst = node.pNext;
}
else {
item.tsDLNode<T>::pPrev->tsDLNode<T>::pNext =
item.tsDLNode<T>::pNext;
tsDLNode<T> *pPrevNode = node.pPrev;
pPrevNode->pNext = node.pNext;
}
this->itemCount--;
@@ -285,11 +304,13 @@ public:
//
void push (T &item)
{
item.tsDLNode<T>::pPrev = 0;
item.tsDLNode<T>::pNext = this->pFirst;
tsDLNode<T> &node = item;
node.pPrev = 0;
node.pNext = this->pFirst;
if (this->itemCount) {
this->pFirst->tsDLNode<T>::pPrev = &item;
tsDLNode<T> *pFirstNode = this->pFirst;
pFirstNode->pPrev = &item;
}
else {
this->pLast = &item;
@@ -393,7 +414,8 @@ public:
//
T *operator ++ ()
{
return this->pEntry = this->pEntry->tsDLNode<T>::pNext;
tsDLNode<T> *pNode = this->pEntry;
return this->pEntry = pNode->pNext;
}
//
@@ -402,7 +424,8 @@ public:
T *operator ++ (int)
{
T *pE = this->pEntry;
this->pEntry = this->pEntry->tsDLNode<T>::pNext;
tsDLNode<T> *pNode = this->pEntry;
this->pEntry = pNode->pNext;
return pE;
}
@@ -411,7 +434,8 @@ public:
//
T *operator -- ()
{
return this->pEntry = pEntry->tsDLNode<T>::pPrev;
tsDLNode<T> *pEntryNode = pEntry;
return this->pEntry = pEntryNode->pPrev;
}
//
@@ -420,7 +444,8 @@ public:
T *operator -- (int)
{
T *pE = this->pEntry;
this->pEntry = pEntry->tsDLNode<T>::pPrev;
tsDLNode<T> *pEntryNode = pEntry;
this->pEntry = pEntryNode->pPrev;
return pE;
}
private:
@@ -467,7 +492,8 @@ public:
pCur = this->pList->pFirst;
}
else {
pCur = pCur->tsDLNode<T>::pNext;
tsDLNode<T> *pCurNode = pCur;
pCur = pCurNode->pNext;
}
this->pCurrent = pCur;
return pCur;
@@ -480,7 +506,8 @@ public:
pCur = this->pList->pLast;
}
else {
pCur = pCur->tsDLNode<T>::pPrev;
tsDLNode<T> *pCurNode = pCur;
pCur = pCurNode->pPrev;
}
this->pCurrent = pCur;
return pCur;
@@ -547,11 +574,13 @@ public:
}
T * next ()
{
return this->tsDLIter<T>::next();
tsDLIter<T> &iterBase = *this;
return iterBase.next();
}
T * first()
{
return this->tsDLIter<T>::first();
tsDLIter<T> &iterBase = *this;
return iterBase.first();
}
//
@@ -568,6 +597,8 @@ public:
T *pCur = this->pCurrent;
if (pCur) {
tsDLNode<T> *pCurNode = pCur;
//
// strip const (we didnt declare the
// list const in the constructor)
@@ -578,7 +609,7 @@ public:
//
// Move this->pCurrent to the previous item
//
this->pCurrent = pCur->tsDLNode<T>::pPrev;
this->pCurrent = pCurNode->pPrev;
//
// delete current item
@@ -649,6 +680,8 @@ public:
T *pCur = this->pCurrent;
if (pCur) {
tsDLNode<T> *pCurNode = pCur;
//
// strip const (we didnt declare the
// list const in the constructor)
@@ -660,7 +693,7 @@ public:
// Move this->pCurrent to the item after the
// item being deleted
//
this->pCurrent = pCur->tsDLNode<T>::pNext;
this->pCurrent = pCurNode->pNext;
//
// delete current item

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

@@ -31,6 +31,9 @@
*
* History
* $Log$
* Revision 1.10 1998/02/18 22:53:13 jhill
* fixed gnu warning
*
* Revision 1.9 1998/02/05 23:28:21 jhill
* fixed hp sompiler warnings
*
@@ -107,7 +110,8 @@ public:
//
void insert (T &item, tsSLNode<T> &itemBefore)
{
item.tsSLNode<T>::pNext = itemBefore.pNext;
tsSLNode<T> &node = item;
node.pNext = itemBefore.pNext;
itemBefore.pNext = &item;
}
@@ -127,9 +131,11 @@ public:
//
void remove (tsSLNode<T> &itemBefore)
{
T *pItem = itemBefore.tsSLNode<T>::pNext;
tsSLNode<T> &nodeBefore = itemBefore;
T *pItem = nodeBefore.pNext;
if (pItem) {
itemBefore.tsSLNode<T>::pNext = pItem->tsSLNode<T>::pNext;
tsSLNode<T> *pNode = pItem;
nodeBefore.pNext = pNode->pNext;
}
}
@@ -138,7 +144,8 @@ public:
//
T * get()
{
T *pItem = this->tsSLNode<T>::pNext;
tsSLNode<T> *pThisNode = this;
T *pItem = pThisNode->pNext;
this->remove(*this);
return pItem;
}