From 52710d621101212ada816df47e6030183f4a49bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Wed, 28 Feb 2007 19:35:57 +0000 Subject: [PATCH] fixed the build; I also changed MoveFrom(), untested git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20252 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/util/DoublyLinkedQueue.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/headers/private/kernel/util/DoublyLinkedQueue.h b/headers/private/kernel/util/DoublyLinkedQueue.h index 392f609863..430ac6f09f 100644 --- a/headers/private/kernel/util/DoublyLinkedQueue.h +++ b/headers/private/kernel/util/DoublyLinkedQueue.h @@ -54,7 +54,7 @@ class DoublyLinkedQueue { { fCurrent = fNext; if (fNext) - fNext = fList->GetNext(fNext); + fNext = fQueue->GetNext(fNext); return fCurrent; } @@ -62,7 +62,7 @@ class DoublyLinkedQueue { { Element *element = fCurrent; if (fCurrent) { - fList->Remove(fCurrent); + fQueue->Remove(fCurrent); fCurrent = NULL; } return element; @@ -111,7 +111,7 @@ class DoublyLinkedQueue { { Element *element = fNext; if (fNext) - fNext = fList->GetNext(fNext); + fNext = fQueue->GetNext(fNext); return element; } @@ -282,8 +282,12 @@ DOUBLY_LINKED_QUEUE_CLASS_NAME::MoveFrom(DOUBLY_LINKED_QUEUE_CLASS_NAME *fromLis { if (fromList && fromList->fFirst) { if (fFirst) { - sGetLink(fLast)->next = fromList->fFirst; - sGetLink(fFirst)->previous = fLast; + Element *element = fFirst; + Link *elLink; + while ((elLink = sGetLink(element))->next) { + element = elLink->next; + } + elLink->next = fromList->fFirst; } else { fFirst = fromList->fFirst; }