diff options
author | frosch <frosch@openttd.org> | 2010-01-16 14:22:19 +0000 |
---|---|---|
committer | frosch <frosch@openttd.org> | 2010-01-16 14:22:19 +0000 |
commit | 6465f02fba984e169c904cccf89fd1417ee2f45b (patch) | |
tree | 1708196e69bfc12f14fe47743e26be39c5c1ae65 /src/pathfinder | |
parent | 84ece021fde4850b4755b81bb6886ffced6b7020 (diff) | |
download | openttd-6465f02fba984e169c904cccf89fd1417ee2f45b.tar.xz |
(svn r18826) -Codechange: Unifiy return value of (SmallArray|FixedSizeArray)::(Append|AppendC) with other containers. (skidd13)
Diffstat (limited to 'src/pathfinder')
-rw-r--r-- | src/pathfinder/yapf/nodelist.hpp | 2 | ||||
-rw-r--r-- | src/pathfinder/yapf/yapf_costcache.hpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/pathfinder/yapf/nodelist.hpp b/src/pathfinder/yapf/nodelist.hpp index 3e24e9733..75b459a54 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 13d30c119..e25faa952 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; |