From a64f0e9fc237caba86bb141b887e7137ee26da45 Mon Sep 17 00:00:00 2001
From: Tyler Dauwalder <tylerdauwalder@nowhere.fake>
Date: Tue, 9 Sep 2003 06:22:27 +0000
Subject: [PATCH] Now uses new SinglyLinkedList template parameters.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4602 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/add-ons/kernel/file_systems/udf/Icb.h           |  2 +-
 src/tests/kernel/core/util/SinglyLinkedListTest.cpp | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/add-ons/kernel/file_systems/udf/Icb.h b/src/add-ons/kernel/file_systems/udf/Icb.h
index 88492d9dfd..21de4da2c0 100644
--- a/src/add-ons/kernel/file_systems/udf/Icb.h
+++ b/src/add-ons/kernel/file_systems/udf/Icb.h
@@ -116,7 +116,7 @@ private:
 	CachedBlock fData;
 	status_t fInitStatus;
 	vnode_id fId;
-	SinglyLinkedList<Strategy::SinglyLinkedList::Auto<DirectoryIterator*> > fIteratorList;
+	SinglyLinkedList<DirectoryIterator*> fIteratorList;
 	FileEntry<udf_file_icb_entry> fFileEntry;
 	FileEntry<udf_extended_file_icb_entry> fExtendedEntry;	
 };
diff --git a/src/tests/kernel/core/util/SinglyLinkedListTest.cpp b/src/tests/kernel/core/util/SinglyLinkedListTest.cpp
index c2c7b2df90..05e5c64e3b 100644
--- a/src/tests/kernel/core/util/SinglyLinkedListTest.cpp
+++ b/src/tests/kernel/core/util/SinglyLinkedListTest.cpp
@@ -63,9 +63,11 @@ SinglyLinkedListTest::TestList(List &list, typename List::ValueType *values, int
 		CHK(list.Count() == i+1);
 	}
 	
+{
 	// Prefix increment
 	int preIndex = valueCount-1;
-	for (typename List::Iterator iterator = list.Begin(); iterator != list.End(); --preIndex) {
+	typename List::Iterator iterator;
+	for (iterator = list.Begin(); iterator != list.End(); --preIndex) {
 		NextSubTest();
 // 		printf("(%p, %ld) %s (%p, %ld)\n", iterator->next, iterator->data, ((*iterator == values[preIndex]) ? "==" : "!="), values[preIndex].next, values[preIndex].data);
 		CHK(*iterator == values[preIndex]);
@@ -74,7 +76,7 @@ SinglyLinkedListTest::TestList(List &list, typename List::ValueType *values, int
 		CHK(copy != ++iterator);
 	}
 	CHK(preIndex == -1);
-	
+}	
 	list.MakeEmpty();	
 
 	// PushBack
@@ -102,7 +104,7 @@ SinglyLinkedListTest::TestList(List &list, typename List::ValueType *values, int
 //! Test using the User strategy with the default NextMember.
 void
 SinglyLinkedListTest::UserDefaultTest() {
-	SinglyLinkedList<User<Link> > list;
+	SinglyLinkedList<Link, User<Link> > list;
 	const int valueCount = 10;
 	Link values[valueCount];
 	for (int i = 0; i < valueCount; i++) {
@@ -117,7 +119,7 @@ SinglyLinkedListTest::UserDefaultTest() {
 //! Test using the User strategy with a custom NextMember.
 void
 SinglyLinkedListTest::UserCustomTest() {
-	SinglyLinkedList<User<MyLink, &MyLink::mynext> > list;
+	SinglyLinkedList<MyLink, User<MyLink, &MyLink::mynext> > list;
 	const int valueCount = 10;
 	MyLink values[valueCount];
 	for (int i = 0; i < valueCount; i++) {
@@ -132,7 +134,7 @@ SinglyLinkedListTest::UserCustomTest() {
 //! Test using the Auto strategy.
 void
 SinglyLinkedListTest::AutoTest() {
-	SinglyLinkedList<Auto<long> > list;
+	SinglyLinkedList<long> list;
 	const int valueCount = 10;
 	long values[valueCount];
 	for (int i = 0; i < valueCount; i++) {