i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed the build; I also changed MoveFrom(), untested

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20252 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2007-02-28 19:35:57 +00:00
parent ca954b7816
commit 52710d6211
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/util/DoublyLinkedQueue.h
+9 -5
View File
@@ -54,7 +54,7 @@ class DoublyLinkedQueue {
{ {
fCurrent = fNext; fCurrent = fNext;
if (fNext) if (fNext)
fNext = fList->GetNext(fNext); fNext = fQueue->GetNext(fNext);
return fCurrent; return fCurrent;
} }
@@ -62,7 +62,7 @@ class DoublyLinkedQueue {
{ {
Element *element = fCurrent; Element *element = fCurrent;
if (fCurrent) { if (fCurrent) {
fList->Remove(fCurrent); fQueue->Remove(fCurrent);
fCurrent = NULL; fCurrent = NULL;
} }
return element; return element;
@@ -111,7 +111,7 @@ class DoublyLinkedQueue {
{ {
Element *element = fNext; Element *element = fNext;
if (fNext) if (fNext)
fNext = fList->GetNext(fNext); fNext = fQueue->GetNext(fNext);
return element; return element;
} }
@@ -282,8 +282,12 @@ DOUBLY_LINKED_QUEUE_CLASS_NAME::MoveFrom(DOUBLY_LINKED_QUEUE_CLASS_NAME *fromLis
{ {
if (fromList && fromList->fFirst) { if (fromList && fromList->fFirst) {
if (fFirst) { if (fFirst) {
sGetLink(fLast)->next = fromList->fFirst; Element *element = fFirst;
sGetLink(fFirst)->previous = fLast; Link *elLink;
while ((elLink = sGetLink(element))->next) {
element = elLink->next;
}
elLink->next = fromList->fFirst;
} else { } else {
fFirst = fromList->fFirst; fFirst = fromList->fFirst;
} }