From c7dafb9a26e355621a8f99b5fb470ceb97ce1fd0 Mon Sep 17 00:00:00 2001
From: frosch <frosch@openttd.org>
Date: Sat, 16 Jan 2010 13:52:24 +0000
Subject: (svn r18822) -Codechange: Rename YAPF-related container classes and
 their members to better fit other container classes. (skidd13)

---
 src/pathfinder/yapf/nodelist.hpp       | 6 +++---
 src/pathfinder/yapf/yapf_costcache.hpp | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/pathfinder')

diff --git a/src/pathfinder/yapf/nodelist.hpp b/src/pathfinder/yapf/nodelist.hpp
index 915342e1d..3e24e9733 100644
--- a/src/pathfinder/yapf/nodelist.hpp
+++ b/src/pathfinder/yapf/nodelist.hpp
@@ -27,7 +27,7 @@ public:
 	/** make Titem_::Key a property of HashTable */
 	typedef typename Titem_::Key Key;
 	/** type that we will use as item container */
-	typedef CArrayT<Titem_, 65536, 256> CItemArray;
+	typedef SmallArray<Titem_, 65536, 256> CItemArray;
 	/** how pointers to open nodes will be stored */
 	typedef CHashTableT<Titem_, Thash_bits_open_  > COpenList;
 	/** how pointers to closed nodes will be stored */
@@ -74,7 +74,7 @@ public:
 	/** allocate new data item from m_arr */
 	FORCEINLINE Titem_ *CreateNewNode()
 	{
-		if (m_new_node == NULL) m_new_node = &m_arr.Add();
+		if (m_new_node == NULL) m_new_node = &m_arr.AppendC();
 		return m_new_node;
 	}
 
@@ -152,7 +152,7 @@ public:
 		return item;
 	}
 
-	FORCEINLINE int TotalCount() {return m_arr.Size();}
+	FORCEINLINE int TotalCount() {return m_arr.Length();}
 	FORCEINLINE Titem_& ItemAt(int idx) {return m_arr[idx];}
 
 	template <class D> void Dump(D &dmp) const
diff --git a/src/pathfinder/yapf/yapf_costcache.hpp b/src/pathfinder/yapf/yapf_costcache.hpp
index 810579120..13d30c119 100644
--- a/src/pathfinder/yapf/yapf_costcache.hpp
+++ b/src/pathfinder/yapf/yapf_costcache.hpp
@@ -53,7 +53,7 @@ public:
 	typedef typename Node::Key Key;               ///< key to hash tables
 	typedef typename Node::CachedData CachedData;
 	typedef typename CachedData::Key CacheKey;
-	typedef CArrayT<CachedData> LocalCache;
+	typedef SmallArray<CachedData> LocalCache;
 
 protected:
 	LocalCache      m_local_cache;
@@ -70,7 +70,7 @@ public:
 	FORCEINLINE bool PfNodeCacheFetch(Node& n)
 	{
 		CacheKey key(n.GetKey());
-		Yapf().ConnectNodeToCachedData(n, *new (&m_local_cache.AddNC()) CachedData(key));
+		Yapf().ConnectNodeToCachedData(n, *new (&m_local_cache.Append()) CachedData(key));
 		return false;
 	}
 
@@ -113,7 +113,7 @@ struct CSegmentCostCacheT
 	enum {c_hash_bits = 14};
 
 	typedef CHashTableT<Tsegment, c_hash_bits> HashTable;
-	typedef CArrayT<Tsegment> Heap;
+	typedef SmallArray<Tsegment> Heap;
 	typedef typename Tsegment::Key Key;    ///< key to hash table
 
 	HashTable    m_map;
@@ -133,7 +133,7 @@ struct CSegmentCostCacheT
 		Tsegment *item = m_map.Find(key);
 		if (item == NULL) {
 			*found = false;
-			item = new (&m_heap.AddNC()) Tsegment(key);
+			item = new (&m_heap.Append()) Tsegment(key);
 			m_map.Push(*item);
 		} else {
 			*found = true;
-- 
cgit v1.2.3-54-g00ecf