From 49a6b46eba2bf4317e79919aa1d77f14b33a549a Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Sat, 7 Aug 1999 00:36:14 +0000
Subject: [PATCH] fixed issues discoverd by GNU G++

---
 src/cxxTemplates/tsBTree.h         | 5 +++--
 src/cxxTemplates/tsDLList.h        | 8 ++++----
 src/libCom/cxxTemplates/tsBTree.h  | 5 +++--
 src/libCom/cxxTemplates/tsDLList.h | 8 ++++----
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/cxxTemplates/tsBTree.h b/src/cxxTemplates/tsBTree.h
index 333b226e2..a6eb49041 100644
--- a/src/cxxTemplates/tsBTree.h
+++ b/src/cxxTemplates/tsBTree.h
@@ -205,8 +205,9 @@ public:
 
 	void insert(T &item)
 	{
-		item.tsBTreeNode<T>::pLeft = 0;
-		item.tsBTreeNode<T>::pRight = 0;
+		tsBTreeNode<T> &node = item;
+		node.pLeft = 0;
+		node.pRight = 0;
 		if (this->pRoot) {
 			tsBTreeNode<T>::insert(*this->pRoot, item);
 		}
diff --git a/src/cxxTemplates/tsDLList.h b/src/cxxTemplates/tsDLList.h
index 14767e388..2856896cc 100644
--- a/src/cxxTemplates/tsDLList.h
+++ b/src/cxxTemplates/tsDLList.h
@@ -521,13 +521,13 @@ void tsDLList<T>::insertBefore (T &item, T &itemAfter)
 	tsDLNode<T> &node = item;
 	tsDLNode<T> &nodeAfter = itemAfter;
 
-	tsDLNode.pNext = &itemAfter;
-	tsDLNode.pPrev = nodeAfter.pPrev;
+	node.pNext = &itemAfter;
+	node.pPrev = nodeAfter.pPrev;
 	nodeAfter.pPrev = &item;
 
 	if (node.pPrev) {
-		tsDLNode<T> *pPrevNode = node.pPrev;
-		pPrevNode->pNext = &item;
+		tsDLNode<T> &prevNode = *node.pPrev;
+		prevNode.pNext = &item;
 	}
 	else {
 		this->pFirst = &item;
diff --git a/src/libCom/cxxTemplates/tsBTree.h b/src/libCom/cxxTemplates/tsBTree.h
index 333b226e2..a6eb49041 100644
--- a/src/libCom/cxxTemplates/tsBTree.h
+++ b/src/libCom/cxxTemplates/tsBTree.h
@@ -205,8 +205,9 @@ public:
 
 	void insert(T &item)
 	{
-		item.tsBTreeNode<T>::pLeft = 0;
-		item.tsBTreeNode<T>::pRight = 0;
+		tsBTreeNode<T> &node = item;
+		node.pLeft = 0;
+		node.pRight = 0;
 		if (this->pRoot) {
 			tsBTreeNode<T>::insert(*this->pRoot, item);
 		}
diff --git a/src/libCom/cxxTemplates/tsDLList.h b/src/libCom/cxxTemplates/tsDLList.h
index 14767e388..2856896cc 100644
--- a/src/libCom/cxxTemplates/tsDLList.h
+++ b/src/libCom/cxxTemplates/tsDLList.h
@@ -521,13 +521,13 @@ void tsDLList<T>::insertBefore (T &item, T &itemAfter)
 	tsDLNode<T> &node = item;
 	tsDLNode<T> &nodeAfter = itemAfter;
 
-	tsDLNode.pNext = &itemAfter;
-	tsDLNode.pPrev = nodeAfter.pPrev;
+	node.pNext = &itemAfter;
+	node.pPrev = nodeAfter.pPrev;
 	nodeAfter.pPrev = &item;
 
 	if (node.pPrev) {
-		tsDLNode<T> *pPrevNode = node.pPrev;
-		pPrevNode->pNext = &item;
+		tsDLNode<T> &prevNode = *node.pPrev;
+		prevNode.pNext = &item;
 	}
 	else {
 		this->pFirst = &item;