From dd03cd54ee0050367e9583572ed9fadc083b4811 Mon Sep 17 00:00:00 2001 From: yexo Date: Thu, 25 Feb 2010 11:48:50 +0000 Subject: (svn r19242) -Codechange: Perfer pointer instead of reference (skidd13) -Cleanup: merge PopHead() and RemoveHead() into Shift() --- src/pathfinder/yapf/nodelist.hpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/pathfinder/yapf') diff --git a/src/pathfinder/yapf/nodelist.hpp b/src/pathfinder/yapf/nodelist.hpp index 9260c45f7..6ac3b944c 100644 --- a/src/pathfinder/yapf/nodelist.hpp +++ b/src/pathfinder/yapf/nodelist.hpp @@ -93,7 +93,7 @@ public: { assert(m_closed.Find(item.GetKey()) == NULL); m_open.Push(item); - m_open_queue.Push(item); + m_open_queue.Push(&item); if (&item == m_new_node) { m_new_node = NULL; } @@ -103,8 +103,7 @@ public: FORCEINLINE Titem_ *GetBestOpenNode() { if (!m_open_queue.IsEmpty()) { - Titem_& item = m_open_queue.GetHead(); - return &item; + return m_open_queue.Begin(); } return NULL; } @@ -113,9 +112,9 @@ public: FORCEINLINE Titem_ *PopBestOpenNode() { if (!m_open_queue.IsEmpty()) { - Titem_& item = m_open_queue.PopHead(); - m_open.Pop(item); - return &item; + Titem_ *item = m_open_queue.Shift(); + m_open.Pop(*item); + return item; } return NULL; } -- cgit v1.2.3-54-g00ecf