From c33fc11c302b8a477acb6770ee2b187d822629a5 Mon Sep 17 00:00:00 2001
From: sje <sje@4f64403b-2f21-0410-a795-97e2b3489a10>
Date: Tue, 30 Oct 2007 05:10:11 +0000
Subject: fix collection.h to build under mingw

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@375 4f64403b-2f21-0410-a795-97e2b3489a10
---
 font_service/collection.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'font_service/collection.h')

diff --git a/font_service/collection.h b/font_service/collection.h
index d0570f4..f8709e3 100644
--- a/font_service/collection.h
+++ b/font_service/collection.h
@@ -202,7 +202,7 @@ public:
 	}
 
 	virtual void add_all(DynamicArray<T> &other) {
-		for(DynamicArray<T>::Iterator i = other.start(); i.has_val(); i.next()) {
+		for(Iterator i = other.start(); i.has_val(); i.next()) {
 			add(i.val());
 		}
 	}
@@ -554,7 +554,7 @@ protected:
 			if(n->parent->left == o) n->parent->left = n;
 			else if(n->parent->right == o) n->parent->right = n;
 		} else
-			root = n;
+			BinaryTree<T, N>::root = n;
 	}
 
 	void rotate_left(N *n) {
@@ -570,7 +570,7 @@ protected:
 			if(p->parent->left == q) p->parent->left = p;
 			else if(p->parent->right == q) p->parent->right = p;
 		} else
-			root = p;
+			BinaryTree<T, N>::root = p;
 	}
 	void rotate_right(N *n) {
 		N *p = n->left;
@@ -585,7 +585,7 @@ protected:
 			if(p->parent->left == q) p->parent->left = p;
 			else if(p->parent->right == q) p->parent->right = p;
 		} else
-			root = p;
+			BinaryTree<T, N>::root = p;
 	}
 
 	void insert_case1(N *n) {
@@ -643,7 +643,7 @@ protected:
 			} else
 				delete_case1(n);
 		}
-		if(root == n) root = 0;
+		if(BinaryTree<T, N>::root == n) BinaryTree<T, N>::root = 0;
 		delete n;
 		Collection<T>::count--;
 	}
@@ -773,7 +773,7 @@ template<class A, class B, class N = ColouredTreeNode<Pair<A, B> > > class Map:
 protected:
 	
 	N *find(A &key) const {
-		N *n = root;
+		N *n = RedBlackTree< Pair< A, B >, N >::root;
 		while(n) {
 			if(n->val.first == key)
 				return n;
-- 
cgit v1.2.3