From 6465f02fba984e169c904cccf89fd1417ee2f45b Mon Sep 17 00:00:00 2001
From: frosch <frosch@openttd.org>
Date: Sat, 16 Jan 2010 14:22:19 +0000
Subject: [PATCH] (svn r18826) -Codechange: Unifiy return value of
 (SmallArray|FixedSizeArray)::(Append|AppendC) with other containers.
 (skidd13)

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

diff --git a/src/misc/array.hpp b/src/misc/array.hpp
index e4cf194083..78dd0098f1 100644
--- a/src/misc/array.hpp
+++ b/src/misc/array.hpp
@@ -35,7 +35,7 @@ protected:
 			SubArray& s = data[super_size - 1];
 			if (!s.IsFull()) return s;
 		}
-		return data.AppendC();
+		return *data.AppendC();
 	}
 
 public:
@@ -56,9 +56,9 @@ public:
 	/** return true if array is full */
 	FORCEINLINE bool IsFull() { return data.IsFull() && data[N - 1].IsFull(); }
 	/** allocate but not construct new item */
-	FORCEINLINE T& Append() { return FirstFreeSubArray().Append(); }
+	FORCEINLINE T *Append() { return FirstFreeSubArray().Append(); }
 	/** allocate and construct new item */
-	FORCEINLINE T& AppendC() { return FirstFreeSubArray().AppendC(); }
+	FORCEINLINE T *AppendC() { return FirstFreeSubArray().AppendC(); }
 	/** indexed access (non-const) */
 	FORCEINLINE T& operator [] (uint index)
 	{
diff --git a/src/misc/fixedsizearray.hpp b/src/misc/fixedsizearray.hpp
index 435dfad79d..5d52c2881f 100644
--- a/src/misc/fixedsizearray.hpp
+++ b/src/misc/fixedsizearray.hpp
@@ -93,9 +93,9 @@ public:
 	/** return true if array is empty */
 	FORCEINLINE bool IsEmpty() const { return Length() <= 0; };
 	/** add (allocate), but don't construct item */
-	FORCEINLINE T& Append() { assert(!IsFull()); return data[SizeRef()++]; }
+	FORCEINLINE T *Append() { assert(!IsFull()); return &data[SizeRef()++]; }
 	/** add and construct item using default constructor */
-	FORCEINLINE T& AppendC() { T& item = Append(); new(&item)T; return item; }
+	FORCEINLINE T *AppendC() { T *item = Append(); new(item)T; return item; }
 	/** return item by index (non-const version) */
 	FORCEINLINE T& operator [] (uint index) { assert(index < Length()); return data[index]; }
 	/** return item by index (const version) */
diff --git a/src/pathfinder/yapf/nodelist.hpp b/src/pathfinder/yapf/nodelist.hpp
index 3e24e97332..75b459a54c 100644
--- a/src/pathfinder/yapf/nodelist.hpp
+++ b/src/pathfinder/yapf/nodelist.hpp
@@ -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.AppendC();
+		if (m_new_node == NULL) m_new_node = m_arr.AppendC();
 		return m_new_node;
 	}
 
diff --git a/src/pathfinder/yapf/yapf_costcache.hpp b/src/pathfinder/yapf/yapf_costcache.hpp
index 13d30c1194..e25faa9520 100644
--- a/src/pathfinder/yapf/yapf_costcache.hpp
+++ b/src/pathfinder/yapf/yapf_costcache.hpp
@@ -70,7 +70,7 @@ public:
 	FORCEINLINE bool PfNodeCacheFetch(Node& n)
 	{
 		CacheKey key(n.GetKey());
-		Yapf().ConnectNodeToCachedData(n, *new (&m_local_cache.Append()) CachedData(key));
+		Yapf().ConnectNodeToCachedData(n, *new (m_local_cache.Append()) CachedData(key));
 		return false;
 	}
 
@@ -133,7 +133,7 @@ struct CSegmentCostCacheT
 		Tsegment *item = m_map.Find(key);
 		if (item == NULL) {
 			*found = false;
-			item = new (&m_heap.Append()) Tsegment(key);
+			item = new (m_heap.Append()) Tsegment(key);
 			m_map.Push(*item);
 		} else {
 			*found = true;